HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1676:66188ee0d6a5

Removes defualt realse and debug build setting

Michal Klocek -

r1676:66188ee0d6a5

parent child

Context file:

r1676:66188ee0d6a5

Collapse all files

config.pri +19 -17

+            ##################### LIB #################################################
             LIBRARY_NAME = QtCommercialChart
             CONFIG(debug, debug|release) {
                 mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug)
                 win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d)
             }
-            coverage: CONFIG += debug
+            LIBS += -l$$LIBRARY_NAME
+            # This will undefine Q_DECL_EXPORT/Q_DECL_IMPORT at qchartglobal.h
+            # They should not be used for staticlib builds.
+            staticlib:DEFINES+=QTCOMMERCIALCHART_STATICLIB
             ##################### SHADOW CONFIG #################################################
             !contains($${PWD}, $${OUT_PWD}){
                 search = "$$PWD:::"
                 temp = $$split(search,"/")
                 temp = $$last(temp)
                 path = $$replace(search,$$temp,'')
                 temp = $$split(OUT_PWD,$$path)
                 temp = $$split(temp,'/')
                 temp = $$first(temp)
                 path = "$${path}$${temp}"
                 SHADOW=$$path
             }else{
                 SHADOW=$$PWD
                 CONFIG-=development_build
             }
             ##################### BUILD PATHS ##################################################
             CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
             CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
             CHART_BUILD_LIB_DIR = $$SHADOW/lib
             CHART_BUILD_DIR = $$SHADOW/build
             CHART_BUILD_BIN_DIR = $$SHADOW/bin
             CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_BIN_DIR/QtCommercial/Chart
             CHART_BUILD_DOC_DIR = $$SHADOW/doc
             # Use own folders for debug and release builds
-            !coverage {
-                CONFIG(debug, debug|release):CHART_BUILD_DIR = $$join(CHART_BUILD_DIR,,,/debug)
+            CONFIG(debug, debug|release):CHART_BUILD_DIR = $$join(CHART_BUILD_DIR,,,/debug)
-                CONFIG(release, debug|release): CHART_BUILD_DIR = $$join(CHART_BUILD_DIR,,,/release)
+            CONFIG(release, debug|release): CHART_BUILD_DIR = $$join(CHART_BUILD_DIR,,,/release)
             win32:{
                 CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
                 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
                 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
                 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
                 CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\")
                 CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\")
                 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
             }
             mac: {
                 # TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on
                 # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8
                 # without these definitions, so this is probably a configuration issue on QtCommercial 4.8;
                 # it should probably define the minimum OSX version to be 10.5...
                 QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
                 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
             }
-            ##################### DEVELOPMENT BUILD ###################################################
+            ##################### INCLUDES ############################################################
-            development_build: {
-                DEFINES+=DEVELOPMENT_BUILD
-                CONFIG+=debug_and_release
-            ##################### BUILD CONFIG ########################################################
             INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
             !win32: {
                 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
             } else {
                 win32-msvc*: {
                     # hack fix for error:
                     #   "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
                     QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
                 } else {
                     LIBS += -L $$CHART_BUILD_LIB_DIR
                 }
             }
-            LIBS += -l$$LIBRARY_NAME
+            ##################### DEVELOPMENT BUILD ###################################################
-            # This will undefine Q_DECL_EXPORT/Q_DECL_IMPORT at qchartglobal.h
+            development_build: {
-            # They should not be used for staticlib builds.
+                DEFINES+=DEVELOPMENT_BUILD
-            staticlib:DEFINES+=QTCOMMERCIALCHART_STATICLIB
+                CONFIG+=debug_and_release
+                CONFIG+=build_all
+            }
             ##################### UNIT TESTS ##############################################################
             CONFIG(debug, debug|release) {
                 CONFIG+=test_private
                 DEFINES+=BUILD_PRIVATE_UNIT_TESTS
             }
+            #################### COVERAGE #################################################################
+            coverage: CONFIG += debug

plugins/declarative/declarative.pro 0 -6

             TARGET = qtcommercialchartqml
             QT += declarative
             !include( ../plugins.pri ) {
                 error( "Couldn't find the plugins.pri file!" )
             }
             contains(QT_MAJOR_VERSION, 5) {
                 # TODO: QtQuick2 not supported by the implementation currently
                 DEFINES += QTQUICK2
             }
             CONFIG(debug, debug|release) {
               mac: TARGET = $$join(TARGET,,,_debug)
               win32: TARGET = $$join(TARGET,,,d)
             }
-            # enable building debug and release at the same time
-            CONFIG += debug_and_release
-            # On windows by default build both debug and release at the same time
-            win32:CONFIG += build_all
             SOURCES += \
                 plugin.cpp \
                 declarativechart.cpp \
                 declarativexypoint.cpp \
                 declarativexyseries.cpp \
                 declarativelineseries.cpp \
                 declarativesplineseries.cpp \
                 declarativeareaseries.cpp \
                 declarativescatterseries.cpp \
                 declarativepieseries.cpp \
                 declarativebarseries.cpp
             HEADERS += \
                 declarativechart.h \
                 declarativexypoint.h \
                 declarativexyseries.h \
                 declarativelineseries.h \
                 declarativesplineseries.h \
                 declarativeareaseries.h \
                 declarativescatterseries.h \
                 declarativepieseries.h \
                 declarativebarseries.h
             TARGETPATH = QtCommercial/Chart
             target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
             qmldir.files += $$PWD/qmldir
             qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
             INSTALLS += target qmldir
             FILE = $$PWD/qmldir
             win32:{FILE = $$replace(FILE, "/","\\")}
             QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_PLUGIN_DIR

src/src.pro 0 -6

             !include( ../config.pri ):error( "Couldn't find the config.pri file!" )
             ############################# BUILD CONFIG ######################################
             TARGET = $$LIBRARY_NAME
             DESTDIR = $$CHART_BUILD_LIB_DIR
             TEMPLATE = lib
             QT = core gui
             DEFINES += QTCOMMERCIALCHART_LIBRARY
             win32:CONFIG += create_prl
             # treat warnings as errors
             win32-msvc*: {
                 QMAKE_CXXFLAGS += /WX
             } else {
                 QMAKE_CXXFLAGS += -Werror
             }
             unix:{
               QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
             }
-            # enable building debug and release at the same time
-            CONFIG += debug_and_release
-            # On windows by default build both debug and release at the same time
-            win32:CONFIG += build_all
             ############################# DEPEDENCES ########################################
             win32-msvc*: LIBS += User32.lib
             LIBS -= -l$$LIBRARY_NAME
             INCLUDEPATH += ../include .
             ############################# SOURCES ##########################################
             SOURCES += \
                 $$PWD/chartdataset.cpp \
                 $$PWD/chartpresenter.cpp \
                 $$PWD/charttheme.cpp \
                 $$PWD/domain.cpp \
                 $$PWD/qchart.cpp \
                 $$PWD/qchartview.cpp \
                 $$PWD/qabstractseries.cpp \
                 $$PWD/chartbackground.cpp \
                 $$PWD/chart.cpp \
                 $$PWD/scroller.cpp \
                 $$PWD/chartlayout.cpp
             PRIVATE_HEADERS += \
                 $$PWD/chartdataset_p.h \
                 $$PWD/chartitem_p.h \
                 $$PWD/chartpresenter_p.h \
                 $$PWD/charttheme_p.h \
                 $$PWD/domain_p.h \
                 $$PWD/chartbackground_p.h \
                 $$PWD/chart_p.h \
                 $$PWD/chartconfig_p.h \
                 $$PWD/qchart_p.h \
                 $$PWD/qchartview_p.h \
                 $$PWD/scroller_p.h \
                 $$PWD/qabstractseries_p.h \
                 $$PWD/chartlayout_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qchart.h \
                 $$PWD/qchartglobal.h \
                 $$PWD/qabstractseries.h \
                 $$PWD/qchartview.h
             include(animations/animations.pri)
             include(areachart/areachart.pri)
             include(axis/axis.pri)
             include(barchart/barchart.pri)
             include(legend/legend.pri)
             include(linechart/linechart.pri)
             include(piechart/piechart.pri)
             include(scatterchart/scatter.pri)
             include(splinechart/splinechart.pri)
             include(themes/themes.pri)
             include(xychart/xychart.pri)
             HEADERS += $$PUBLIC_HEADERS
             HEADERS += $$PRIVATE_HEADERS
             HEADERS += $$THEMES
             ############################# BUILD PATH ##########################################
             OBJECTS_DIR = $$CHART_BUILD_DIR/lib
             MOC_DIR = $$CHART_BUILD_DIR/lib
             UI_DIR = $$CHART_BUILD_DIR/lib
             RCC_DIR = $$CHART_BUILD_DIR/lib
             ############################# PUBLIC HEADERS GENERTOR ##########################################
             #this is very primitive and lame parser , TODO: make perl script insted
             !exists($$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal)
             {
                 system($$QMAKE_MKDIR $$CHART_BUILD_PUBLIC_HEADER_DIR)
                  win32:{
                     command = "echo $${LITERAL_HASH}include \"qchartglobal.h\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
                 }else{
                     command = "echo \"$${LITERAL_HASH}include \\\"qchartglobal.h\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
                 }
                 PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal
                 system($$command)
             }
             for(file, PUBLIC_HEADERS) {
                 name = $$split(file,'/')
                 name = $$last(name)
                 class = "$$cat($$file)"
                 class = $$find(class,class)
                 !isEmpty(class){
                 class = $$split(class,QTCOMMERCIALCHART_EXPORT)
                 class = $$member(class,1)
                 class = $$split(class,' ')
                 class = $$replace(class,' ','')
                 class = $$member(class,0)
                 win32:{
                     command = "echo $${LITERAL_HASH}include \"$$name\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
                 }else{
                     command = "echo \"$${LITERAL_HASH}include \\\"$$name\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
                 }
                 PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class
                 system($$command)
                 }
             }
             ############################# INSTALLERS ##########################################
             public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
             public_headers.files = $$PUBLIC_HEADERS $$PUBLIC_QT_HEADERS
             INSTALLS += public_headers
             install_build_public_headers.name = build_public_headers
             install_build_public_headers.output = $$CHART_BUILD_PUBLIC_HEADER_DIR/${QMAKE_FILE_BASE}.h
             install_build_public_headers.input = PUBLIC_HEADERS
             install_build_public_headers.commands = $$QMAKE_COPY \
                 ${QMAKE_FILE_NAME} \
                 $$CHART_BUILD_PUBLIC_HEADER_DIR
             install_build_public_headers.CONFIG += target_predeps \
                 no_link
             install_build_private_headers.name = buld_private_headers
             install_build_private_headers.output = $$CHART_BUILD_PRIVATE_HEADER_DIR/${QMAKE_FILE_BASE}.h
             install_build_private_headers.input = PRIVATE_HEADERS
             install_build_private_headers.commands = $$QMAKE_COPY \
                 ${QMAKE_FILE_NAME} \
                 $$CHART_BUILD_PRIVATE_HEADER_DIR
             install_build_private_headers.CONFIG += target_predeps \
                 no_link
             QMAKE_EXTRA_COMPILERS += install_build_public_headers \
                 install_build_private_headers \
             win32:{
                bintarget.CONFIG += no_check_exist
                !staticlib: {
                   bintarget.files += $$CHART_BUILD_LIB_DIR\\$${TARGET}.dll
                }
                win32-msvc*:CONFIG(debug, debug|release): {
                   bintarget.files += $$CHART_BUILD_LIB_DIR\\$${TARGET}.pdb
                }
                bintarget.path = $$[QT_INSTALL_BINS]
                libtarget.CONFIG += no_check_exist
                libtarget.files = $$CHART_BUILD_LIB_DIR\\$${TARGET}.prl
                win32-msvc*: {
                   libtarget.files += $$CHART_BUILD_LIB_DIR\\$${TARGET}.lib
                } else {
                   libtarget.files += $$CHART_BUILD_LIB_DIR\\lib$${TARGET}.a
                }
                libtarget.path = $$[QT_INSTALL_LIBS]
                DLLDESTDIR = $$CHART_BUILD_BIN_DIR
                INSTALLS += bintarget libtarget
             }else{
                target.path=$$[QT_INSTALL_LIBS]
                INSTALLS += target
             }
             mac: !staticlib: {
                 # Update the name (id) of the library on OSX to point to the lib path
                 MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib"
                 QMAKE_POST_LINK += "install_name_tool -id $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME"
                 # Update the name (id) of the installed library on OSX to point to the installation path
                 postinstall.path = $$[QT_INSTALL_LIBS]
                 postinstall.extra = "install_name_tool -id $$[QT_INSTALL_LIBS]"/"$$MAC_CHARTS_LIB_NAME $$[QT_INSTALL_LIBS]"/"$$MAC_CHARTS_LIB_NAME"
                 INSTALLS += postinstall
             }
             ################################ DEVELOPMENT BUILD ##########################################
             # There is a problem with jom.exe currently. It does not seem to understand QMAKE_EXTRA_TARGETS properly.
             # This is the case at least with shadow builds.
             # http://qt-project.org/wiki/jom
             development_build:!win32-msvc*:{
                 chartversion.target = $$PWD/qchartversion_p.h
                 unix:{
                     chartversion.commands = @echo \
                         \" $${LITERAL_HASH}ifndef QCHARTVERSION_P_H\\n\
                         $${LITERAL_HASH}define QCHARTVERSION_P_H\\n\
                         const char *buildTime = \\\"`date +'%y%m%d%H%M'`\\\" ; \\n\
                         const char *gitHead = \\\"`git rev-parse HEAD`\\\" ; \\n \
                         $${LITERAL_HASH}endif \"  \
                         > \
                         $$chartversion.target;
                 }else{
                     chartversion.commands = @echo \
                         "const char *buildTime = \"%date%_%time%\" ; \
                          const char *gitHead = \"unknown\" ; " \
                         > \
                         $$chartversion.target
                 }
                 chartversion.depends = $$HEADERS \
                     $$SOURCES
                 PRE_TARGETDEPS += $$chartversion.target
                 QMAKE_CLEAN += $$PWD/qchartversion_p.h
                 QMAKE_EXTRA_TARGETS += chartversion
             }
             ############################### CLEAN ###########################################
             unix:QMAKE_DISTCLEAN += -r \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR
             win32:QMAKE_DISTCLEAN += /Q \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR
             ############################## COVERAGE #########################################
             unix:coverage:{
             QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
             QMAKE_LDFLAGS += -fprofile-arcs -ftest-coverage
             LIBS += -lgcov
             QMAKE_CLEAN += $$OBJECTS_DIR/*.gcda $$OBJECTS_DIR/*.gcno $$PWD/*.gcov ../coverage/*.info
             QMAKE_EXTRA_TARGETS += preparecoverage gencoverage
             preparecoverage.target = prepare_coverage
             preparecoverage.depends = all
             preparecoverage.commands =  lcov --directory $$OBJECTS_DIR --zerocounters ;\
                                         lcov -i -d $$OBJECTS_DIR -c -o ../coverage/base.info -b $$PWD;
             gencoverage.target = gen_coverage
             gencoverage.depends = all
             gencoverage.commands = lcov -d $$OBJECTS_DIR -c -o ../coverage/src.info -b $$PWD;\
                                    lcov -e ../coverage/base.info $$PWD/* $$PWD/animations/* $$PWD/areachart/* $$PWD/axis/* $$PWD/barchart/* $$PWD/legend/* $$PWD/linechart/* $$PWD/piechart/* $$PWD/scatterchart/* $$PWD/splinechart/* $$PWD/themes/* $$PWD/xychart/* -o ../coverage/base.info;\
                                    lcov -e ../coverage/src.info $$PWD/* $$PWD/animations/* $$PWD/areachart/* $$PWD/axis/* $$PWD/barchart/* $$PWD/legend/* $$PWD/linechart/* $$PWD/piechart/* $$PWD/scatterchart/* $$PWD/splinechart/* $$PWD/themes/* $$PWD/xychart/* -o ../coverage/src.info;\
                                    lcov -a ../coverage/base.info -a ../coverage/src.info -o ../coverage/coverage.info;
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages