Drop PersistentCacheTileDataSource from 'lite' profile, reorganize an…

…d clean up profile related configuration

BUILDING.md

@@ -50,6 +50,9 @@ which are defined in 'scripts/build/sdk_profiles.json' file. Different profiles
 example the official SDK builds are currently compiled with 'valhalla+nmlmodellodtree' profiles. The
 following instructions use 'standard' profile as an example.
 
+In order to make SDK binaries as small as possible, 'lite' profile can be used. This profile disables
+geocoding, routing and offline support, but resulting binaries are about 40% smaller.
+
 ## Building process
 Be patient - full build will take 1+ hours. You can speed it up by limiting architectures and platforms where it is built.
 

NEWS.md

@@ -10,6 +10,8 @@ CARTO Mobile SDK 4.4.4
 * Fixed issues with 'feature id' handling in vector tile renderer when feature was used in multiple layers
 * Updated harfbuzz dependency to the latest stable version
 * Fixed wrong compilation profile used for UWP builds, resulting in missing a few features
+* Dropped 'PersistentCacheTileDataSource' from 'lite' compilation profile, making 'lite' SDK build smaller
+* Minor fixes related to non-standard SDK profiles
 * Minor optimizations
 
 

all/modules/core/Address.i

@@ -5,6 +5,8 @@
 
 %module Address
 
+#ifdef _CARTO_GEOCODING_SUPPORT
+
 !proxy_imports(carto::Address, core.StringVector)
 
 %{
@@ -35,3 +37,5 @@
 %include "core/Address.h"
 
 #endif
+
+#endif

all/modules/datasources/PersistentCacheTileDataSource.i

@@ -3,6 +3,8 @@
 
 %module(directors="1") PersistentCacheTileDataSource
 
+#ifdef _CARTO_OFFLINE_SUPPORT
+
 !proxy_imports(carto::PersistentCacheTileDataSource, core.MapBounds, core.MapTile, core.MapBounds, core.StringMap, datasources.CacheTileDataSource, datasources.TileDownloadListener, datasources.components.TileData)
 
 %{
@@ -30,3 +32,5 @@
 %include "datasources/PersistentCacheTileDataSource.h"
 
 #endif
+
+#endif

all/modules/geocoding/GeocodingAddress.i

@@ -5,6 +5,8 @@
 
 %module GeocodingAddress
 
+#ifdef _CARTO_GEOCODING_SUPPORT
+
 !proxy_imports(carto::GeocodingAddress, core.Address, core.StringVector)
 
 %{
@@ -24,3 +26,5 @@
 %include "geocoding/GeocodingAddress.h"
 
 #endif
+
+#endif

all/native/core/Address.cpp

@@ -1,3 +1,5 @@
+#ifdef _CARTO_GEOCODING_SUPPORT
+
 #include "Address.h"
 
 #include <sstream>
@@ -119,3 +121,5 @@ namespace carto {
     }
 
 }
+
+#endif

all/native/core/Address.h

@@ -7,6 +7,8 @@
 #ifndef _CARTO_ADDRESS_H_
 #define _CARTO_ADDRESS_H_
 
+#ifdef _CARTO_GEOCODING_SUPPORT
+
 #include <string>
 #include <vector>
 
@@ -140,3 +142,5 @@ namespace carto {
 }
 
 #endif
+
+#endif

all/native/datasources/PersistentCacheTileDataSource.cpp

@@ -1,3 +1,5 @@
+#ifdef _CARTO_OFFLINE_SUPPORT
+
 #include "PersistentCacheTileDataSource.h"
 #include "core/BinaryData.h"
 #include "datasources/TileDownloadListener.h"
@@ -408,3 +410,5 @@ namespace carto {
     const unsigned int PersistentCacheTileDataSource::EXTRA_TILE_FOOTPRINT = 1024;
 
 }
+
+#endif

all/native/datasources/PersistentCacheTileDataSource.h

@@ -7,6 +7,8 @@
 #ifndef _CARTO_PERSISTENTCACHETILEDATASOURCE_H_
 #define _CARTO_PERSISTENTCACHETILEDATASOURCE_H_
 
+#ifdef _CARTO_OFFLINE_SUPPORT
+
 #include "core/MapBounds.h"
 #include "components/CancelableThreadPool.h"
 #include "components/DirectorPtr.h"
@@ -135,3 +137,5 @@ namespace carto {
 }
 
 #endif
+
+#endif

all/native/geocoding/GeocodingAddress.cpp

@@ -1,3 +1,5 @@
+#ifdef _CARTO_GEOCODING_SUPPORT
+
 #include "GeocodingAddress.h"
 
 namespace carto {
@@ -16,3 +18,5 @@ namespace carto {
     }
 
 }
+
+#endif

all/native/geocoding/GeocodingAddress.h

@@ -7,6 +7,8 @@
 #ifndef _CARTO_GEOCODINGADDRESS_H_
 #define _CARTO_GEOCODINGADDRESS_H_
 
+#ifdef _CARTO_GEOCODING_SUPPORT
+
 #include "core/Address.h"
 
 namespace carto {
@@ -40,3 +42,5 @@ namespace carto {
 }
 
 #endif
+
+#endif

ios/objc/CartoMobileSDK.h

@@ -10,7 +10,9 @@
 #import "NTOptions.h"
 #import "NTLayers.h"
 
+#ifdef _CARTO_GEOCODING_SUPPORT
 #import "NTAddress.h"
+#endif
 #import "NTMapBounds.h"
 #import "NTMapEnvelope.h"
 #import "NTMapPos.h"
@@ -32,7 +34,6 @@
 #import "NTGeoJSONVectorTileDataSource.h"
 #import "NTHTTPTileDataSource.h"
 #import "NTMemoryCacheTileDataSource.h"
-#import "NTPersistentCacheTileDataSource.h"
 #import "NTCartoOnlineTileDataSource.h"
 #import "NTMapTilerOnlineTileDataSource.h"
 #import "NTLocalVectorDataSource.h"
@@ -157,6 +158,7 @@
 
 #ifdef _CARTO_OFFLINE_SUPPORT
 #import "NTMBTilesTileDataSource.h"
+#import "NTPersistentCacheTileDataSource.h"
 #endif
 
 #ifdef _CARTO_PACKAGEMANAGER_SUPPORT

scripts/build/CMakeLists.txt

@@ -109,8 +109,8 @@ if(WIN32)
 endif(WIN32)
 
 # Subprojects
-set(SDK_CARTO_SUBPROJECTS vt mapnikvt mbvtbuilder cartocss nml osrm sgre geocoding)
-set(SDK_EXTERNAL_SUBPROJECTS botan pugixml sqlite sqlite3pp bidi freetype harfbuzz brotli miniz libjpeg libpng libwebp tess2 pvrt rg_etc1)
+set(SDK_CARTO_SUBPROJECTS vt mapnikvt mbvtbuilder cartocss nml)
+set(SDK_EXTERNAL_SUBPROJECTS botan pugixml bidi freetype harfbuzz brotli miniz libjpeg libpng libwebp tess2 pvrt rg_etc1)
 
 if(WIN32)
   list(APPEND SDK_EXTERNAL_SUBPROJECTS "zlib")
@@ -120,6 +120,18 @@ if(NOT (WIN32 OR APPLE OR ANDROID))
   list(APPEND SDK_EXTERNAL_SUBPROJECTS "pion")
 endif()
 
+if(INCLUDE_GEOCODING)
+  list(APPEND SDK_CARTO_SUBPROJECTS "geocoding")
+endif(INCLUDE_GEOCODING)
+
+if(INCLUDE_ROUTING)
+  list(APPEND SDK_CARTO_SUBPROJECTS "osrm" "sgre")
+endif(INCLUDE_ROUTING)
+
+if(INCLUDE_SQLITE)
+  list(APPEND SDK_EXTERNAL_SUBPROJECTS "sqlite" "sqlite3pp")
+endif(INCLUDE_SQLITE)
+
 if(INCLUDE_VALHALLA)
   list(APPEND SDK_EXTERNAL_SUBPROJECTS "date" "protobuf" "valhalla")
 endif(INCLUDE_VALHALLA)

scripts/build/sdk_build_utils.py

@@ -104,7 +104,7 @@ def getProfile(profileIds):
   defines = set()
   cmakeOptions = set()
   allProfileIds = profileIds.split('+')
-  if 'lite' not in profileIds:
+  if 'lite' not in allProfileIds:
     allProfileIds.append(getDefaultProfileId())
   for profileId in allProfileIds:
     profile = getProfiles()[profileId]

scripts/build/sdk_profiles.json

@@ -4,6 +4,7 @@
 	},
 
 	"standard": {
+		"cmake-options": "INCLUDE_SQLITE:BOOL=ON;INCLUDE_ROUTING:BOOL=ON;INCLUDE_GEOCODING:BOOL=ON",
 		"defines": "_CARTO_SERVICES_SUPPORT;_CARTO_SEARCH_SUPPORT;_CARTO_GEOCODING_SUPPORT;_CARTO_ROUTING_SUPPORT;_CARTO_OFFLINE_SUPPORT;_CARTO_PACKAGEMANAGER_SUPPORT;_CARTO_LICENSEMANAGER_SUPPORT;_CARTO_EDITABLE_SUPPORT;_CARTO_WKBT_SUPPORT"
 	},
 
@@ -14,10 +15,5 @@
 
 	"nmlmodellodtree": {
 		"defines": "_CARTO_NMLMODELLODTREE_SUPPORT"
-	},
-
-	"gisextensions": {
-		"cmake-options": "INCLUDE_GDAL:BOOL=ON",
-		"defines": "_CARTO_GDAL_SUPPORT"
 	}
 }