Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Commit 683a0a5

Browse files
aminyaaminya
committed
Move pcre to common targets
1 parent 9b0131c commit 683a0a5

File tree

1 file changed

+58
-69
lines changed

1 file changed

+58
-69
lines changed

‎binding.gyp‎

Lines changed: 58 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,12 @@
4343
# Node's util.h may be accidentally included so use this to guard
4444
# against compilation error.
4545
'SRC_UTIL_H_',
46+
'GIT_REGEX_BUILTIN',
4647
],
4748
'dependencies': [
4849
'zlib',
4950
'http_parser',
51+
'pcre'
5052
],
5153
# Automatically generated by using the following command in bash:
5254
# find "./deps/libgit2/src" -mindepth 1 -type f ! -path "./deps/libgit2/src/win32/*" ! -path "./deps/libgit2/src/unix/*" ! -path "./deps/libgit2/src/hash/*" -print0 | xargs -0 -I {} echo " '{}',"
@@ -357,12 +359,8 @@
357359
['OS=="win"', {
358360
'defines': [
359361
'GIT_WINHTTP',
360-
'GIT_REGEX_BUILTIN',
361362
'GIT_SHA1_WIN32'
362363
],
363-
'dependencies': [
364-
'pcre',
365-
],
366364
'link_settings': {
367365
'libraries': [
368366
'-lcrypt32.lib',
@@ -522,9 +520,6 @@
522520
'msvs_disabled_warnings': [
523521
4005, # macro redefinition
524522
],
525-
'include_dirs': [
526-
'deps/libgit2/deps/regex',
527-
],
528523
}],
529524
],
530525
},
@@ -551,67 +546,61 @@
551546
}],
552547
],
553548
},
554-
],
555-
'conditions': [
556-
['OS=="win"', {
557-
'targets': [
558-
{
559-
'target_name': 'pcre',
560-
'win_delay_load_hook': 'false',
561-
'type': 'static_library',
562-
# Automatically generated by using the following command in bash:
563-
# find "./deps/libgit2/deps/pcre" -regex ".*\.[h|c]" -print0 | xargs -0 -I {} echo " '{}',"
564-
'sources': [
565-
'./deps/libgit2/deps/pcre/pcre.h',
566-
'./deps/libgit2/deps/pcre/pcreposix.c',
567-
'./deps/libgit2/deps/pcre/pcreposix.h',
568-
'./deps/libgit2/deps/pcre/pcre_byte_order.c',
569-
'./deps/libgit2/deps/pcre/pcre_chartables.c',
570-
'./deps/libgit2/deps/pcre/pcre_compile.c',
571-
'./deps/libgit2/deps/pcre/pcre_config.c',
572-
'./deps/libgit2/deps/pcre/pcre_dfa_exec.c',
573-
'./deps/libgit2/deps/pcre/pcre_exec.c',
574-
'./deps/libgit2/deps/pcre/pcre_fullinfo.c',
575-
'./deps/libgit2/deps/pcre/pcre_get.c',
576-
'./deps/libgit2/deps/pcre/pcre_globals.c',
577-
'./deps/libgit2/deps/pcre/pcre_internal.h',
578-
'./deps/libgit2/deps/pcre/pcre_jit_compile.c',
579-
'./deps/libgit2/deps/pcre/pcre_maketables.c',
580-
'./deps/libgit2/deps/pcre/pcre_newline.c',
581-
'./deps/libgit2/deps/pcre/pcre_ord2utf8.c',
582-
'./deps/libgit2/deps/pcre/pcre_printint.c',
583-
'./deps/libgit2/deps/pcre/pcre_refcount.c',
584-
'./deps/libgit2/deps/pcre/pcre_string_utils.c',
585-
'./deps/libgit2/deps/pcre/pcre_study.c',
586-
'./deps/libgit2/deps/pcre/pcre_tables.c',
587-
'./deps/libgit2/deps/pcre/pcre_ucd.c',
588-
'./deps/libgit2/deps/pcre/pcre_valid_utf8.c',
589-
'./deps/libgit2/deps/pcre/pcre_version.c',
590-
'./deps/libgit2/deps/pcre/pcre_xclass.c',
591-
'./deps/libgit2/deps/pcre/ucp.h',
549+
{
550+
'target_name': 'pcre',
551+
'win_delay_load_hook': 'false',
552+
'type': 'static_library',
553+
# Automatically generated by using the following command in bash:
554+
# find "./deps/libgit2/deps/pcre" -regex ".*\.[h|c]" -print0 | xargs -0 -I {} echo " '{}',"
555+
'sources': [
556+
'./deps/libgit2/deps/pcre/pcre.h',
557+
'./deps/libgit2/deps/pcre/pcreposix.c',
558+
'./deps/libgit2/deps/pcre/pcreposix.h',
559+
'./deps/libgit2/deps/pcre/pcre_byte_order.c',
560+
'./deps/libgit2/deps/pcre/pcre_chartables.c',
561+
'./deps/libgit2/deps/pcre/pcre_compile.c',
562+
'./deps/libgit2/deps/pcre/pcre_config.c',
563+
'./deps/libgit2/deps/pcre/pcre_dfa_exec.c',
564+
'./deps/libgit2/deps/pcre/pcre_exec.c',
565+
'./deps/libgit2/deps/pcre/pcre_fullinfo.c',
566+
'./deps/libgit2/deps/pcre/pcre_get.c',
567+
'./deps/libgit2/deps/pcre/pcre_globals.c',
568+
'./deps/libgit2/deps/pcre/pcre_internal.h',
569+
'./deps/libgit2/deps/pcre/pcre_jit_compile.c',
570+
'./deps/libgit2/deps/pcre/pcre_maketables.c',
571+
'./deps/libgit2/deps/pcre/pcre_newline.c',
572+
'./deps/libgit2/deps/pcre/pcre_ord2utf8.c',
573+
'./deps/libgit2/deps/pcre/pcre_printint.c',
574+
'./deps/libgit2/deps/pcre/pcre_refcount.c',
575+
'./deps/libgit2/deps/pcre/pcre_string_utils.c',
576+
'./deps/libgit2/deps/pcre/pcre_study.c',
577+
'./deps/libgit2/deps/pcre/pcre_tables.c',
578+
'./deps/libgit2/deps/pcre/pcre_ucd.c',
579+
'./deps/libgit2/deps/pcre/pcre_valid_utf8.c',
580+
'./deps/libgit2/deps/pcre/pcre_version.c',
581+
'./deps/libgit2/deps/pcre/pcre_xclass.c',
582+
'./deps/libgit2/deps/pcre/ucp.h',
592583

593-
],
594-
'defines': [
595-
'SUPPORT_PCRE8=1',
596-
'LINK_SIZE=2',
597-
'PARENS_NEST_LIMIT=250',
598-
'MATCH_LIMIT=10000000',
599-
'MATCH_LIMIT_RECURSION="MATCH_LIMIT"',
600-
'NEWLINE="LF"',
601-
'NO_RECURSE=1',
602-
'POSIX_MALLOC_THRESHOLD=10',
603-
'BSR_ANYCRLF=0',
604-
'MAX_NAME_SIZE=32',
605-
'MAX_NAME_COUNT=10000',
606-
],
607-
'include_dirs': [],
608-
'direct_dependent_settings': {
609-
'include_dirs': [
610-
'deps/libgit2/deps/pcre',
611-
],
612-
},
613-
},
614-
]
615-
}]
616-
]
584+
],
585+
'defines': [
586+
'SUPPORT_PCRE8=1',
587+
'LINK_SIZE=2',
588+
'PARENS_NEST_LIMIT=250',
589+
'MATCH_LIMIT=10000000',
590+
'MATCH_LIMIT_RECURSION="MATCH_LIMIT"',
591+
'NEWLINE="LF"',
592+
'NO_RECURSE=1',
593+
'POSIX_MALLOC_THRESHOLD=10',
594+
'BSR_ANYCRLF=0',
595+
'MAX_NAME_SIZE=32',
596+
'MAX_NAME_COUNT=10000',
597+
],
598+
'include_dirs': [],
599+
'direct_dependent_settings': {
600+
'include_dirs': [
601+
'deps/libgit2/deps/pcre',
602+
],
603+
},
604+
},
605+
],
617606
}

0 commit comments

Comments
 (0)