HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r808:7ea08dd6d356

Fix shadow build/jom.exe problems

Jani Honkonen -

r808:7ea08dd6d356

parent child

Context file:

r808:7ea08dd6d356

Collapse all files

src/chartconfig_p.h +8 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef CHARTCONFIG_H_
             #define CHARTCONFIG_H_
             #include "qchartglobal.h"
+            #ifdef Q_CC_MSVC
+            // 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
+            const char *buildTime = __DATE__;
+            const char *gitHead = "unknown";
+            #else
             #include "qchartversion_p.h"
+            #endif
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartConfig {
             private:
                 ChartConfig(){
                 #ifndef QT_NO_DEBUG
                     qDebug()<<"buildTime" << buildTime;
                     qDebug()<<"gitHead" << gitHead;
                 #endif
                     m_instance = this;
                 }
             public:
                 static ChartConfig* instance(){
                     if(!m_instance){
                         m_instance= new ChartConfig();
                     }
                     return m_instance;
                 }
                 QString compilationTime(){
                     return buildTime;
                 }
                 QString compilationHead(){
                     return gitHead;
                 }
             private:
                 static ChartConfig* m_instance;
             };
             ChartConfig* ChartConfig::m_instance=0;
             #endif
             QTCOMMERCIALCHART_END_NAMESPACE

src/src.pro +29 -17

             !include( ../common.pri ):error( Couldn't find the common.pri file! )
             TARGET = QtCommercialChart
             DESTDIR = $$CHART_BUILD_LIB_DIR
             TEMPLATE = lib
             QT += core \
                 gui
             win32-msvc*: LIBS += User32.lib
             CONFIG += debug_and_release
             CONFIG(debug, debug|release):TARGET = QtCommercialChartd
             SOURCES += \
                 $$PWD/chartdataset.cpp \
                 $$PWD/chartpresenter.cpp \
                 $$PWD/charttheme.cpp \
                 $$PWD/domain.cpp \
                 $$PWD/qchart.cpp \
                 $$PWD/qchartview.cpp \
                 $$PWD/qseries.cpp \
                 $$PWD/qlegend.cpp \
                 $$PWD/legendmarker.cpp \
                 $$PWD/legendscrollbutton.cpp \
                 $$PWD/chartbackground.cpp \
                 $$PWD/chart.cpp
             PRIVATE_HEADERS += \
                 $$PWD/chartdataset_p.h \
                 $$PWD/chartitem_p.h \
                 $$PWD/chartpresenter_p.h \
                 $$PWD/charttheme_p.h \
                 $$PWD/domain_p.h \
                 $$PWD/legendmarker_p.h \
                 $$PWD/legendscrollbutton_p.h \
                 $$PWD/chartbackground_p.h \
                 $$PWD/chart_p.h \
                 $$PWD/chartconfig_p.h \
                 $$PWD/qchart_p.h \
                 $$PWD/qchartview_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qchart.h \
                 $$PWD/qchartglobal.h \
                 $$PWD/qseries.h \
                 $$PWD/qchartview.h \
                 $$PWD/qlegend.h
             include(animations/animations.pri)
             include(axis/axis.pri)
             include(xychart/xychart.pri)
             include(linechart/linechart.pri)
             include(areachart/areachart.pri)
             include(barchart/barchart.pri)
             include(piechart/piechart.pri)
             include(scatterseries/scatter.pri)
             include(splinechart/splinechart.pri)
             include(themes/themes.pri)
             HEADERS += $$PUBLIC_HEADERS
             HEADERS += $$PRIVATE_HEADERS
             HEADERS += $$THEMES
             INCLUDEPATH += ../include .
             OBJECTS_DIR = $$CHART_BUILD_DIR/lib
             MOC_DIR = $$CHART_BUILD_DIR/lib
             UI_DIR = $$CHART_BUILD_DIR/lib
             RCC_DIR = $$CHART_BUILD_DIR/lib
             DEFINES += QTCOMMERCIALCHART_LIBRARY
             #qt public headers
             #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"
                 }
                 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)
                 }
             }
             public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
             public_headers.files = $$PUBLIC_HEADERS $$PUBLIC_QT_HEADERS
             target.path = $$[QT_INSTALL_LIBS]
             INSTALLS += target 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 \
-            chartversion.target = $$PWD/qchartversion_p.h
+            !win32-msvc*: {
-            unix:{
-                chartversion.commands = @echo \
+                # There is a problem with jom.exe currently. It does not seem to understand QMAKE_EXTRA_TARGETS properly.
-                    "const char *buildTime = \\\"`date +'%y%m%d%H%M'`\\\" \\; \
+                # This is the case at least with shadow builds.
-                     const char *gitHead = \\\"`git rev-parse HEAD`\\\" \\; " \
+                # http://qt-project.org/wiki/jom
-                    > \
-                    $$chartversion.target;
+                chartversion.target = $$PWD/qchartversion_p.h
-            }else{
-                chartversion.commands = @echo \
+                unix:{
-                    "const char *buildTime = \"%date%_%time%\" ; \
+                    chartversion.commands = @echo \
-                     const char *gitHead = \"unknown\" ; " \
+                        "const char *buildTime = \\\"`date +'%y%m%d%H%M'`\\\" \\; \
-                    > \
+                         const char *gitHead = \\\"`git rev-parse HEAD`\\\" \\; " \
-                    $$chartversion.target
+                        > \
+                        $$chartversion.target;
+                }else{
+                    chartversion.commands = @echo \
+                        "const char *buildTime = \"%date%_%time%\" ; \
+                         const char *gitHead = \"unknown\" ; " \
+                        > \
+                        $$chartversion.target
+                }
+                chartversion.depends = $$HEADERS \
+                    $$SOURCES
+                PRE_TARGETDEPS += $$PWD/qchartversion_p.h
+                QMAKE_CLEAN += $$PWD/qchartversion_p.h
+                QMAKE_EXTRA_TARGETS += chartversion
             }
-            chartversion.depends = $$HEADERS \
-                $$SOURCES
-            PRE_TARGETDEPS += $$PWD/qchartversion_p.h
-            QMAKE_EXTRA_TARGETS += chartversion
             unix:QMAKE_DISTCLEAN += -r \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR
             win32:QMAKE_DISTCLEAN += /Q \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR
             # treat warnings as errors
             win32-msvc*: {
                 QMAKE_CXXFLAGS += /WX
             } else {
                 QMAKE_CXXFLAGS += -Werror
             }

src/qchartversion_p.h removed 0 -1

NO CONTENT: file was removed

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