AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #469 from deathbaba/qmake-ordered-fix

Browse source 
2 to 10 times faster C++ core libraries compilation & rebuild.
This commit is contained in:
Ilya Zverev 2015-11-11 09:27:53 +03:00
commit 34e4466f5a
5 changed files with 129 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drape/drape_common.pri
View file

@ -1,11 +1,11 @@
CMDRES = $$system(python ../tools/autobuild/shader_preprocessor.py $$SHADER_COMPILE_ARGS)
message($$CMDRES)
!isEmpty($$CMDRES):message($$CMDRES)
INCLUDEPATH *= $$ROOT_DIR/3party/freetype/include
INCLUDEPATH *= $$ROOT_DIR/3party/expat/lib
SOURCES += \
$$ROOT_DIR/3party/stb_image/sdf_image.cpp \
$$ROOT_DIR/3party/sdf_image/sdf_image.cpp \
$$ROOT_DIR/3party/stb_image/stb_image.c \
$$DRAPE_DIR/data_buffer.cpp \
$$DRAPE_DIR/binding_info.cpp \
@ -44,8 +44,8 @@ SOURCES += \
$$DRAPE_DIR/utils/vertex_decl.cpp
HEADERS += \
$$ROOT_DIR/sdf_image/sdf_image.h \
$$ROOT_DIR/stb_image/stb_image.h \
$$ROOT_DIR/3party/sdf_image/sdf_image.h \
$$ROOT_DIR/3party/stb_image/stb_image.h \
$$DRAPE_DIR/data_buffer.hpp \
$$DRAPE_DIR/binding_info.hpp \
$$DRAPE_DIR/batcher.hpp \

2
geometry/geometry_tests/geometry_tests.pro
View file

@ -6,6 +6,8 @@ CONFIG -= app_bundle
TEMPLATE = app
ROOT_DIR = ../..
# TODO(AlexZ): latlon.hpp introduces indexer dependency for tests,
# because of indexer/mercator.hpp. Either move latlon to indexer, or mercator to geometry.
DEPENDENCIES = indexer geometry base
include($$ROOT_DIR/common.pri)

1
map/benchmark_tool/benchmark_tool.pro
View file

@ -6,6 +6,7 @@ CONFIG -= app_bundle
TEMPLATE = app
ROOT_DIR = ../..
DEPENDENCIES = map indexer platform geometry coding base gflags protobuf tomcrypt
include($$ROOT_DIR/common.pri)

164
omim.pro
View file

@ -5,7 +5,10 @@
# map_designer: enable designer-related flags
# no-tests: do not build tests for desktop
# drape: include drape libraries
# iphone / tizen / android: build an app (implies no-tests)
#
# There are no supported options in CONFIG for mobile platforms.
# Please use XCode or gradle/Android Studio.
lessThan(QT_MAJOR_VERSION, 5) {
error("You need Qt 5 to build this project. You have Qt $$QT_VERSION")
@ -14,10 +17,10 @@ lessThan(QT_MAJOR_VERSION, 5) {
cache()
TEMPLATE = subdirs
CONFIG += ordered
HEADERS += defines.hpp
# TODO(AlexZ): Why is it here? Drape should build on win32 too.
win32:CONFIG(drape) {
CONFIG -= drape
}
@ -26,75 +29,140 @@ win32:CONFIG(drape) {
CONFIG *= desktop
}
SUBDIRS = 3party base geometry coding
SUBDIRS += indexer
SUBDIRS += routing
SUBDIRS = 3party base coding geometry indexer routing
!CONFIG(osrm) {
SUBDIRS += platform
SUBDIRS += stats
SUBDIRS += storage
SUBDIRS *= platform stats storage
# Integration tests dependencies for gtool
# Integration tests dependencies for gtool.
# TODO(AlexZ): Avoid duplication for routing_integration_tests.
CONFIG(gtool):!CONFIG(no-tests) {
SUBDIRS += search
SUBDIRS += map
SUBDIRS += routing/routing_integration_tests
SUBDIRS *= search map
routing_integration_tests.subdir = routing/routing_integration_tests
routing_integration_tests.depends = $$SUBDIRS
SUBDIRS *= routing_integration_tests
}
CONFIG(desktop) {
SUBDIRS += generator generator/generator_tool
SUBDIRS *= generator
generator_tool.subdir = generator/generator_tool
generator_tool.depends = $$SUBDIRS
SUBDIRS *= generator_tool
}
}
!CONFIG(gtool):!CONFIG(osrm) {
SUBDIRS *= anim
SUBDIRS *= graphics
SUBDIRS *= gui
SUBDIRS *= render
SUBDIRS *= search
SUBDIRS *= map
CONFIG(desktop) {
SUBDIRS += qt
}
SUBDIRS *= anim graphics gui render search map
CONFIG(map_designer):CONFIG(desktop) {
SUBDIRS += skin_generator
SUBDIRS *= skin_generator
}
CONFIG(drape) {
SUBDIRS += drape drape_frontend
SUBDIRS *= drape drape_frontend
CONFIG(desktop) {
SUBDIRS += drape_head
drape_head.depends = $$SUBDIRS
SUBDIRS *= drape_head
}
}
CONFIG(desktop) {
benchmark_tool.subdir = map/benchmark_tool
benchmark_tool.depends = 3party base coding geometry platform indexer map
SUBDIRS *= benchmark_tool
qt.depends = $$SUBDIRS
SUBDIRS *= qt
}
CONFIG(desktop):!CONFIG(no-tests) {
SUBDIRS += base/base_tests
SUBDIRS += coding/coding_tests
SUBDIRS += platform/platform_tests_support
SUBDIRS += geometry/geometry_tests
SUBDIRS += platform/platform_tests
SUBDIRS += platform/downloader_tests
SUBDIRS += qt_tstfrm
SUBDIRS += render/render_tests
SUBDIRS += storage/storage_tests
SUBDIRS += search/search_tests
SUBDIRS += map/map_tests map/benchmark_tool map/mwm_tests map/style_tests
SUBDIRS += routing/routing_integration_tests
SUBDIRS += routing/routing_tests
SUBDIRS += generator/generator_tests
SUBDIRS += indexer/indexer_tests
SUBDIRS += graphics/graphics_tests
SUBDIRS += gui/gui_tests
SUBDIRS += pedestrian_routing_tests
SUBDIRS += search/search_integration_tests
# Additional desktop-only, tests-only libraries.
platform_tests_support.subdir = platform/platform_tests_support
SUBDIRS *= platform_tests_support
# Tests binaries.
base_tests.subdir = base/base_tests
base_tests.depends = base
SUBDIRS *= base_tests
coding_tests.subdir = coding/coding_tests
coding_tests.depends = 3party base
SUBDIRS *= coding_tests
geometry_tests.subdir = geometry/geometry_tests
geometry_tests.depends = 3party base geometry indexer
SUBDIRS *= geometry_tests
indexer_tests.subdir = indexer/indexer_tests
indexer_tests.depends = 3party base coding geometry indexer
SUBDIRS *= indexer_tests
platform_tests.subdir = platform/platform_tests
platform_tests.depends = 3party base coding platform platform_tests_support
SUBDIRS *= platform_tests
downloader_tests.subdir = platform/downloader_tests
downloader_tests.depends = 3party base coding platform platform_tests_support
SUBDIRS *= downloader_tests
storage_tests.subdir = storage/storage_tests
storage_tests.depends = 3party base coding geometry platform storage indexer stats
SUBDIRS *= storage_tests
search_tests.subdir = search/search_tests
search_tests.depends = 3party base coding geometry platform indexer search
SUBDIRS *= search_tests
search_integration_tests.subdir = search/search_integration_tests
search_integration_tests.depends = 3party base coding geometry platform indexer search
SUBDIRS *= search_integration_tests
MapDepLibs = 3party base coding geometry platform storage indexer search map
map_tests.subdir = map/map_tests
map_tests.depends = $$MapDepLibs
SUBDIRS *= map_tests
mwm_tests.subdir = map/mwm_tests
mwm_tests.depends = $$MapDepLibs
SUBDIRS *= mwm_tests
style_tests.subdir = map/style_tests
style_tests.depends = $$MapDepLibs
SUBDIRS *= style_tests
routing_tests.subdir = routing/routing_tests
routing_tests.depends = $$MapDepLibs routing
SUBDIRS *= routing_tests
routing_integration_tests.subdir = routing/routing_integration_tests
routing_integration_tests.depends = $$MapDepLibs routing
SUBDIRS *= routing_integration_tests
# TODO(AlexZ): Move pedestrian tests into routing dir.
pedestrian_routing_tests.depends = $$MapDepLibs routing
SUBDIRS *= pedestrian_routing_tests
generator_tests.subdir = generator/generator_tests
generator_tests.depends = $$MapDepLibs routing generator
SUBDIRS *= generator_tests
# TODO(AlexZ): Do we really need them?
#SUBDIRS += render/render_tests
#SUBDIRS += graphics/graphics_tests
#SUBDIRS += gui/gui_tests
CONFIG(drape) {
SUBDIRS += drape/drape_tests
SUBDIRS += drape_frontend/drape_frontend_tests
SUBDIRS *= qt_tstfrm
drape_tests.subdir = drape/drape_tests
drape_tests.depends = 3party base coding platform qt_tstfrm
SUBDIRS *= drape_tests
drape_frontend_tests.subdir = drape_frontend/drape_frontend_tests
drape_frontend_tests.depends = 3party base coding platform drape drape_frontend
SUBDIRS *= drape_frontend_tests
}
} # !no-tests
} # !gtool

10
tools/autobuild/shader_preprocessor.py
View file

@ -214,8 +214,9 @@ def validateDocumentation(shaders, shaderDir):
for shader in shaders:
if formatShaderDocName(shader) not in docFiles:
undocumentedShaders.append(shader)
if undocumentedShaders:
print("no documentation for shaders:", undocumentedShaders)
# TODO(AlexZ): Commented out lines below to avoid qtcreator console spamming.
#if undocumentedShaders:
#print("no documentation for shaders:", undocumentedShaders)
#exit(20)
if len(sys.argv) < 4:
@ -238,7 +239,8 @@ if definitionChanged(headerFile, formatOutFilePath(shaderDir, definesFile)):
f = open(formatOutFilePath(shaderDir, definesFile), 'w')
f.write(headerFile)
f.close()
else:
print("No need to update definition file")
# TODO(AlexZ): Commented out lines below to avoid qtcreator console spamming.
#else:
#print("No need to update definition file")
writeImplementationFile(programDefinition, programIndex, shaderIndex, shaderDir, implFile, definesFile, shaders)
validateDocumentation(shaders, shaderDir)