Skip to content

Commit

Permalink
convert all spaces to tabs in gyp files (path of least changes)
Browse files Browse the repository at this point in the history
  • Loading branch information
mmomtchev committed Jun 17, 2024
1 parent 726f32c commit 61d9159
Show file tree
Hide file tree
Showing 28 changed files with 242 additions and 242 deletions.
32 changes: 16 additions & 16 deletions binding.gyp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"includes": [
"includes": [
"common.gypi"
],
"variables": {
Expand Down Expand Up @@ -68,17 +68,17 @@
"src/collections/rasterband_overviews.cpp",
"src/collections/rasterband_pixels.cpp",
"src/collections/gdal_drivers.cpp",
"src/collections/colortable.cpp"
"src/collections/colortable.cpp"
]
},
"conditions": [
["enable_asan == 'true'", {
"variables": {
"debug_extra_ccflags_cc": [ "-fsanitize=address" ],
"debug_extra_ldflags" : [ "-fsanitize=address" ],
# using ASan in a Node.js add-on on Windows requires an /MDd build (RuntimeLibrary: 3)
# which is not a safe build, so this option is to remain out of reach of children
# (see https://github.com/nodejs/node-gyp/issues/1686)
# using ASan in a Node.js add-on on Windows requires an /MDd build (RuntimeLibrary: 3)
# which is not a safe build, so this option is to remain out of reach of children
# (see https://github.com/nodejs/node-gyp/issues/1686)
"debug_extra_VCCLCompilerTool": [ "/fsanitize=address" ],
"debug_extra_VCLinkerTool" : [ "/fsanitize=address" ]
}
Expand All @@ -89,16 +89,16 @@
"debug_extra_ldflags" : [ "-lgcov", "--coverage" ],
},
}],
["OS == 'mac'", {
["OS == 'mac'", {
"variables": {
"debug_extra_ldflags": [ "-Wl,-bind_at_load" ],
}
}],
["OS == 'linux'", {
"debug_extra_ldflags": [ "-Wl,-bind_at_load" ],
}
}],
["OS == 'linux'", {
"variables": {
"debug_extra_ldflags": [ "-Wl,-z,now" ],
}
}]
"debug_extra_ldflags": [ "-Wl,-z,now" ],
}
}]
],
"targets": [
{
Expand All @@ -109,7 +109,7 @@
"product_extension": "node",
"sources": [ "<@(sources_node_gdal)" ],
"include_dirs": [
"include",
"include",
"<!(node -e \"require('nan')\")"
],
"defines": [
Expand Down Expand Up @@ -177,7 +177,7 @@
"actions": [
{
"action_name": "yatag",
"inputs": [ "<@(sources_node_gdal)", "lib/gdal.js" ],
"inputs": [ "<@(sources_node_gdal)", "lib/gdal.js" ],
"outputs": [ "../lib/index.d.ts" ],
"action": [ "npm", "run", "yatag" ]
}
Expand All @@ -187,7 +187,7 @@
"actions": [
{
"action_name": "yatag",
"inputs": [ "<@(sources_node_gdal)", "lib/gdal.js" ],
"inputs": [ "<@(sources_node_gdal)", "lib/gdal.js" ],
"outputs": [ "lib/index.d.ts" ],
"action": [ 'cmd', '/c"npm run yatag"' ]
}
Expand Down
96 changes: 48 additions & 48 deletions common.gypi
Original file line number Diff line number Diff line change
@@ -1,77 +1,77 @@
{
"variables": {
"runtime%": "node",
"runtime%": "node",
"deps_dir": "./deps"
},
"target_defaults": {
"default_configuration": "Release",
"cflags_cc!": ["-fno-rtti", "-fno-exceptions"],
"cflags!": ["-fno-rtti", "-fno-exceptions"],
# node-gyp sets the standard for us and ensures that its include file comes last
# this is the only reliable way to override it
'cflags_cc/': [ ['exclude', '^-std=(?!gnu\+\+17)'] ],
'cflags_cc':[ '-std=gnu++17' ],
# node-gyp sets the standard for us and ensures that its include file comes last
# this is the only reliable way to override it
'cflags_cc/': [ ['exclude', '^-std=(?!gnu\+\+17)'] ],
'cflags_cc':[ '-std=gnu++17' ],
"variables": {
"debug_extra_ccflags_cc%": [],
"debug_extra_ldflags%" : [],
"debug_extra_VCCLCompilerTool%": [],
"debug_extra_VCLinkerTool%": []
"debug_extra_VCCLCompilerTool%": [],
"debug_extra_VCLinkerTool%": []
},
"defines": [
"NOGDI=1",
"HAVE_LIBZ=1"
"HAVE_LIBZ=1"
],
"xcode_settings": {
"GCC_ENABLE_CPP_RTTI": "YES",
"GCC_ENABLE_CPP_EXCEPTIONS": "YES",
"CLANG_CXX_LIBRARY": "libc++",
"MACOSX_DEPLOYMENT_TARGET": "10.7",
"CLANG_CXX_LIBRARY": "libc++",
"MACOSX_DEPLOYMENT_TARGET": "10.7",
"OTHER_CFLAGS": [
"-Wno-deprecated-register",
"-Wno-unused-const-variable"
],
"OTHER_CPLUSPLUSFLAGS": [
"-std=gnu++17",
"-std=gnu++17",
"-Wno-deprecated-register",
"-Wno-unused-const-variable",
"-frtti",
"-fexceptions"
],
'OTHER_CPLUSPLUSFLAGS/': [ ['exclude', '^-std=(?!gnu\+\+17)'] ],
'OTHER_CPLUSPLUSFLAGS/': [ ['exclude', '^-std=(?!gnu\+\+17)'] ],
},
"msvs_settings": {
"VCCLCompilerTool": {
#"Optimization": 0, # 0:/Od disable, 1:/O1 min size, 2:/O2 max speed, 3:/Ox full optimization
#"InlineFunctionExpansion": 0, #0:/Ob0: disable, 1:/Ob1 inline only marked funtions, 2:/Ob2 inline anything eligible
"AdditionalOptions": [
"/std:c++17",
"/MP", # compile across multiple CPUs
"/GR", # force RTTI
"/EHsc", # same for ExceptionHandling
"/permissive" # for the new MSVC in Github Actions, mostly related to const char to char conversions
],
# see https://github.com/nodejs/node-gyp/issues/2412
"AdditionalOptions/": [
['exclude', '^/GR-$' ],
['exclude', '^[/-]std:(?!c\+\+17)']
],
"ExceptionHandling": 1,
"RuntimeTypeInfo": "true"
}
},
"msvs_settings": {
"VCCLCompilerTool": {
#"Optimization": 0, # 0:/Od disable, 1:/O1 min size, 2:/O2 max speed, 3:/Ox full optimization
#"InlineFunctionExpansion": 0, #0:/Ob0: disable, 1:/Ob1 inline only marked funtions, 2:/Ob2 inline anything eligible
"AdditionalOptions": [
"/std:c++17",
"/MP", # compile across multiple CPUs
"/GR", # force RTTI
"/EHsc", # same for ExceptionHandling
"/permissive" # for the new MSVC in Github Actions, mostly related to const char to char conversions
],
# see https://github.com/nodejs/node-gyp/issues/2412
"AdditionalOptions/": [
['exclude', '^/GR-$' ],
['exclude', '^[/-]std:(?!c\+\+17)']
],
"ExceptionHandling": 1,
"RuntimeTypeInfo": "true"
}
},
"conditions": [
["runtime == 'node'", {
"defines": [
]
}],
["runtime == 'node'", {
"defines": [
]
}],
["OS == 'win'", {
"defines": [
"NOMINMAX",
"WIN32",
"CURL_STATICLIB",
"PROJ_DLL=",
"OPJ_EXPORTS"
],
"NOMINMAX",
"WIN32",
"CURL_STATICLIB",
"PROJ_DLL=",
"OPJ_EXPORTS"
],
"libraries": [
"secur32.lib",
"odbccp32.lib",
Expand All @@ -80,18 +80,18 @@
"ws2_32.lib",
"advapi32.lib",
"wbemuuid.lib",
"Shlwapi.lib"
"Shlwapi.lib"
],
}],
["OS == 'mac'", {
"libraries": [ "-framework Security" ],
"defines": [ "DARWIN" ]
}],
["OS == 'linux'", {
"defines": [ "LINUX" ],
"ldflags": [
"-Wl,--exclude-libs,ALL"
]
"defines": [ "LINUX" ],
"ldflags": [
"-Wl,--exclude-libs,ALL"
]
}]
],
"configurations": {
Expand All @@ -107,7 +107,7 @@
"OTHER_CPLUSPLUSFLAGS": [ "<@(debug_extra_ccflags_cc)" ],
"OTHER_LDFLAGS": [ "<@(debug_extra_ldflags)" ]
}
},
},
"Release": {
"defines": [ "NDEBUG" ],
"defines!": [ "DEBUG" ],
Expand Down
26 changes: 13 additions & 13 deletions deps/libcurl/libcurl.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -170,20 +170,20 @@
"CURL_DISABLE_RTSP=1",
"CURL_DISABLE_SMB=1",
"ENABLE_IPV6=1",
"HAVE_ZLIB_H=1"
"HAVE_ZLIB_H=1"
],
"conditions": [
["runtime == 'electron'", {
"include_dirs": [
"../libgdal/gdal/frmts/zlib"
]
}],
["runtime == 'node' and OS == 'linux'", {
"defines": [
["runtime == 'electron'", {
"include_dirs": [
"../libgdal/gdal/frmts/zlib"
]
}],
["runtime == 'node' and OS == 'linux'", {
"defines": [
"HAVE_LIBSSL=1",
"OPENSSL_API_COMPAT=0x10100001L",
"OPENSSL_CONFIGURED_API=10100",
"OPENSSL_MIN_API=10100",
"OPENSSL_API_COMPAT=0x10100001L",
"OPENSSL_CONFIGURED_API=10100",
"OPENSSL_MIN_API=10100",
"HAVE_OPENSSL_CRYPTO_H=1",
"HAVE_OPENSSL_ERR_H=1",
"HAVE_OPENSSL_PEM_H=1",
Expand All @@ -193,8 +193,8 @@
"HAVE_OPENSSL_VERSION=1",
"HAVE_OPENSSL_X509_H=1",
"USE_OPENSSL=1",
]
}],
]
}],
["OS == 'win'", {
"defines": [
"USE_WINDOWS_SSPI=1",
Expand Down
12 changes: 6 additions & 6 deletions deps/libgdal/common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
"CPU_<(endianness)_ENDIAN=1",
"BIGTIFF_SUPPORT=1",
"ZIP_SUPPORT=1",
"HAVE_LIBZ=1",
"HAVE_LIBZ=1",
"JPEG_SUPPORT=1",
"RENAME_INTERNAL_SHAPELIB_SYMBOLS=1",
"flatbuffers=gdal_flatbuffers"
"RENAME_INTERNAL_SHAPELIB_SYMBOLS=1",
"flatbuffers=gdal_flatbuffers"
],
"dependencies": [
"<(deps_dir)/libexpat/libexpat.gyp:libexpat",
Expand All @@ -71,9 +71,9 @@
}],
["OS == 'linux'", {
"defines": [
"ENABLE_UFFD=1",
"HAVE_5ARGS_MREMAP=1"
]
"ENABLE_UFFD=1",
"HAVE_5ARGS_MREMAP=1"
]
}],
["OS == 'freebsd'", {
"include_dirs": ["./arch/bsd"]
Expand Down
4 changes: 2 additions & 2 deletions deps/libgdal/gyp-formats/grib.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{
"target_name": "libgdal_grib_frmt",
"type": "static_library",
"defines": [ "USE_PNG" ],
"defines": [ "USE_PNG" ],
"sources": [
"../gdal/frmts/grib/degrib/g2clib/pngunpack.c",
"../gdal/frmts/grib/degrib/g2clib/dec_png.c",
Expand Down Expand Up @@ -56,7 +56,7 @@
"../gdal/frmts/grib/degrib/degrib/metaname.cpp",
"../gdal/frmts/grib/gribdataset.cpp",
"../gdal/frmts/grib/gribcreatecopy.cpp",
"../gdal/frmts/grib/gribdrivercore.cpp"
"../gdal/frmts/grib/gribdrivercore.cpp"
],
"include_dirs": [
"../gdal/frmts/grib",
Expand Down
8 changes: 4 additions & 4 deletions deps/libgdal/gyp-formats/hdf5.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"../gdal/frmts/hdf5/hdf5multidim.cpp",
"../gdal/frmts/hdf5/s102dataset.cpp",
"../gdal/frmts/hdf5/iso19115_srs.cpp",
"../gdal/frmts/hdf5/hdf5drivercore.cpp",
"../gdal/frmts/hdf5/s111dataset.cpp",
"../gdal/frmts/hdf5/rat.cpp",
"../gdal/frmts/hdf5/s104dataset.cpp"
"../gdal/frmts/hdf5/hdf5drivercore.cpp",
"../gdal/frmts/hdf5/s111dataset.cpp",
"../gdal/frmts/hdf5/rat.cpp",
"../gdal/frmts/hdf5/s104dataset.cpp"
],
"include_dirs": [
"../gdal/frmts/hdf5"
Expand Down
2 changes: 1 addition & 1 deletion deps/libgdal/gyp-formats/jpeg.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"../gdal/frmts/jpeg/libjpeg/jfdctint.c",
"../gdal/frmts/jpeg/libjpeg/jcmainct.c",
"../gdal/frmts/jpeg/libjpeg/jdmerge.c",
"../gdal/frmts/jpeg/jpegdrivercore.cpp"
"../gdal/frmts/jpeg/jpegdrivercore.cpp"
],
"include_dirs": [
"../gdal/frmts/jpeg",
Expand Down
4 changes: 2 additions & 2 deletions deps/libgdal/gyp-formats/mbtiles.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"../gdal/frmts/mbtiles/mbtilesdataset.cpp"
],
"include_dirs": [
"../gdal/ogr/ogrsf_frmts/sqlite",
"../gdal/ogr/ogrsf_frmts/gpkg",
"../gdal/ogr/ogrsf_frmts/sqlite",
"../gdal/ogr/ogrsf_frmts/gpkg",
"../gdal/ogr/ogrsf_frmts/mvt",
"../gdal/frmts/mbtiles"
]
Expand Down
2 changes: 1 addition & 1 deletion deps/libgdal/gyp-formats/netcdf.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"../gdal/frmts/netcdf/netcdfwriterconfig.cpp",
"../gdal/frmts/netcdf/netcdf_sentinel3_sral_mwr.cpp",
"../gdal/frmts/netcdf/netcdfvirtual.cpp",
"../gdal/frmts/netcdf/netcdfdrivercore.cpp"
"../gdal/frmts/netcdf/netcdfdrivercore.cpp"
],
"include_dirs": [
"../gdal/frmts/netcdf"
Expand Down
2 changes: 1 addition & 1 deletion deps/libgdal/gyp-formats/nitf.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"../gdal/frmts/nitf/nitf_gcprpc.cpp",
"../gdal/frmts/nitf/mgrs.c",
"../gdal/frmts/nitf/nitfwritejpeg.cpp",
"../gdal/frmts/nitf/nitfdrivercore.cpp"
"../gdal/frmts/nitf/nitfdrivercore.cpp"
],
"include_dirs": [
"../gdal/frmts/nitf",
Expand Down
2 changes: 1 addition & 1 deletion deps/libgdal/gyp-formats/ogr_carto.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"../gdal/ogr/ogrsf_frmts/carto/ogrcartodriver.cpp",
"../gdal/ogr/ogrsf_frmts/carto/ogrcartodatasource.cpp",
"../gdal/ogr/ogrsf_frmts/carto/ogrcartoresultlayer.cpp",
"../gdal/ogr/ogrsf_frmts/carto/ogrcartodrivercore.cpp"
"../gdal/ogr/ogrsf_frmts/carto/ogrcartodrivercore.cpp"
],
"include_dirs": [
"../gdal/ogr/ogrsf_frmts/carto",
Expand Down
2 changes: 1 addition & 1 deletion deps/libgdal/gyp-formats/ogr_openfilegdb.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"../gdal/ogr/ogrsf_frmts/openfilegdb/filegdbtable_freelist.cpp",
"../gdal/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer_write.cpp",
"../gdal/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdb_generate_uuid.cpp",
"../gdal/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdrivercore.cpp"
"../gdal/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdrivercore.cpp"
],
"include_dirs": [
"../gdal/ogr/ogrsf_frmts/openfilegdb"
Expand Down
Loading

0 comments on commit 61d9159

Please sign in to comment.