Changeset 342:bdf193a5051e in SMSSender


Ignore:
Timestamp:
Mar 26, 2014 4:07:03 PM (5 years ago)
Author:
Sämy Zehnder <saemy.zehnder@…>
Branch:
separation-frontend-backend
Message:
  • Adjusts what's being installed to where.
  • Adds config parameter install_dev_files; headers and static libraries are only installed if this variable is set.
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • common/common-base.pro

    r334 r342  
    2222LIBS += -lcryptopp
    2323
     24install_dev_files:unix {
     25    target.path = /usr/lib/smssender
     26    INSTALLS += target
     27}
     28
    2429# Input
    25 HEADERS += \
     30HEADERS = \
    2631    business/iaccount.h \
    2732    business/iaccount_tasks.h \
     
    7984    validation/defaultaccountvalidator.h \
    8085    validation/svalidationresult.h
    81 SOURCES += \
     86
     87SOURCES = \
    8288    business/iaccount.cpp \
    8389    business/iaccount_tasks.cpp \
     
    111117    validation/defaultaccountvalidator.cpp \
    112118    validation/svalidationresult.cpp
    113 RESOURCES += \
     119
     120RESOURCES = \
    114121    lib/common.qrc
    115 unix {
    116     target.path = /usr/lib/smssender
    117     INSTALLS += target
    118122
    119     # headers
    120     headers.path = /usr/include/smssender
     123install_dev_files:unix {
     124    headers.path = /usr/include/smssender/common
    121125    headers.files = $$HEADERS
     126
     127    pri.path = /usr/include/smssender
     128    pri.files = \
     129        ../locale.pri \
     130        ../smssender.pri
     131
     132    INSTALLS += headers pri
    122133}
     134
  • common/gui/common-gui.pro

    r341 r342  
    2929    ../libcommon-base$${LIB_SUFFIX}.$$EXT_STATICLIB
    3030
    31 HEADERS += \
     31unix {
     32    target.path = /usr/lib/smssender
     33    INSTALLS += target
     34}
     35
     36HEADERS = \
    3237    business/icontactimporter.h \
    3338    business/igateway.h \
     
    4045    ui/isendingdialog.h
    4146
    42 SOURCES += \
     47SOURCES = \
    4348    ui/iclosepreventabledialog.cpp \
    4449    ui/isendingdialog.cpp
     
    4651RESOURCES = \
    4752    lib/common-gui.qrc
     53
     54install_dev_files:unix {
     55    headers.path = /usr/include/smssender/common/gui
     56    headers.files = $$HEADERS
     57    INSTALLS += headers
     58}
  • frontend/frontend-base.pro

    r341 r342  
    2424    ../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    2525
    26 unix {
    27     # headers
    28     headers.path = /usr/include/smssender
    29     headers.files = $$HEADERS \
    30         frontend-common.inc
     26install_dev_files:unix {
     27    target.path = /usr/lib/smssender
     28    INSTALLS += target
    3129}
    3230
    33 HEADERS += \
     31HEADERS = \
    3432    business/accountinitmanager.h \
    3533    business/accountintegrationhelper.h \
     
    6361    persistence/restrictedmainstorage.h \
    6462
    65 SOURCES += \
     63SOURCES = \
    6664    business/accountinitmanager.cpp \
    6765    business/accountintegrationhelper.cpp \
     
    9391    persistence/restrictedmainstorage.cpp \
    9492
    95 RESOURCES += \
     93RESOURCES = \
    9694    lib/frontend.qrc
     95
     96install_dev_files:unix {
     97    headers.path = /usr/include/smssender/frontend
     98    headers.files = $$HEADERS
     99    INSTALLS += headers
     100}
  • frontend/gui/frontend-gui.pro

    r341 r342  
    4242    INSTALLS += target
    4343}
    44 win32:RC_FILE = lib/smssender.rc
     44win32 {
     45    RC_FILE = lib/smssender.rc
     46}
     47
    4548INCLUDEPATH += \
    4649    ui/components/
     
    4851QMAKE_UIC += -p
    4952
    50 HEADERS +=  \
     53HEADERS =  \
    5154    bootstrap.h \
    5255    business/contactfilesimporter.h \
     
    9396    ui/sendingdialog.h \
    9497    ui/settingsdialog.h \
    95     ui/updatedialog.h
    96 SOURCES += \
     98    ui/updatedialog.h \
     99
     100SOURCES = \
    97101    bootstrap.cpp \
    98102    business/contactfilesimporter.cpp \
     
    140144    ui/sendingdialog.cpp \
    141145    ui/settingsdialog.cpp \
    142     ui/updatedialog.cpp
    143 FORMS += \
     146    ui/updatedialog.cpp \
     147
     148FORMS = \
    144149    ui/about.ui \
    145150    ui/accountlist.ui \
     
    157162    ui/sendingdialog.ui \
    158163    ui/settingsdialog.ui \
    159     ui/updatedialog.ui
    160 RESOURCES += \
    161     lib/frontend-gui.qrc
     164    ui/updatedialog.ui \
     165
     166RESOURCES = \
     167    lib/frontend-gui.qrc \
  • gateways/Schoolnet/gui/schoolnet-gui.pro

    r334 r342  
    2121    ../libschoolnet-base$${LIB_SUFFIX}.$$EXT_STATICLIB
    2222
    23 HEADERS += \
     23HEADERS = \
    2424    schoolnet.h \
    2525    ui/models/questionitemmodel.h \
     
    3333    ui/widgets/settingswidget.h
    3434
    35 SOURCES += \
     35SOURCES = \
    3636    business/gateway.cpp \
    3737    schoolnet.cpp \
     
    4545    ui/widgets/settingswidget.cpp
    4646
    47 FORMS += \
     47FORMS = \
    4848    ui/questionlist.ui \
    4949    ui/widgets/questionbox.ui \
    5050    ui/widgets/settingswidget.ui
    5151
    52 RESOURCES += \
     52RESOURCES = \
    5353    lib/schoolnet-gui.qrc
  • gateways/Schoolnet/schoolnet-base.pro

    r341 r342  
    2525    ../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    2626
    27 HEADERS += \
     27install_dev_files:unix {
     28    target.path = /usr/lib/smssender/gateways
     29    INSTALLS += target
     30}
     31
     32HEADERS = \
    2833    business/account.h \
    2934    business/account_tasks.h \
     
    3843    persistence/accountstoragehelper.h \
    3944    persistence/deepthought/deepthoughtstorage.h
    40 SOURCES += \
     45
     46SOURCES = \
    4147    business/account.cpp \
    4248    business/account_costs.cpp \
     
    5763    persistence/accountstoragehelper.cpp \
    5864    persistence/deepthought/deepthoughtstorage.cpp
    59 RESOURCES += \
     65
     66RESOURCES = \
    6067    lib/schoolnet.qrc
     68
     69install_dev_files:unix {
     70    headers.path = /usr/include/smssender/gateways/Schoolnet
     71    headers.files = $$HEADERS
     72    INSTALLS += headers
     73}
  • gateways/Smartphone/gui/smartphone-gui.pro

    r336 r342  
    3333    ui/components/
    3434
    35 HEADERS += \
     35HEADERS = \
    3636    smartphone.h \
    3737    ui/components/qrcode.h \
    3838    ui/settingswidget.h \
    3939
    40 SOURCES += \
     40SOURCES = \
    4141    business/gateway.cpp \
    4242    smartphone.cpp \
     
    4444    ui/settingswidget.cpp \
    4545
    46 FORMS += \
     46FORMS = \
    4747    ui/settingswidget.ui
    4848
    49 RESOURCES += \
     49RESOURCES = \
    5050    lib/smartphone-gui.qrc
  • gateways/Smartphone/smartphone-base.pro

    r341 r342  
    2424    ../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    2525
    26 HEADERS += \
     26install_dev_files:unix {
     27    target.path = /usr/lib/smssender/gateways
     28    INSTALLS += target
     29}
     30
     31HEADERS = \
    2732    business/account.h \
    2833    business/account_tasks.h \
     
    4651    persistence/gatewaystoragehelper.h \
    4752
    48 SOURCES += \
     53SOURCES = \
    4954    business/account.cpp \
    5055    business/account_costs.cpp \
     
    6772    persistence/gatewaystoragehelper.cpp \
    6873
    69 RESOURCES +=\
     74RESOURCES =\
    7075    lib/smartphone.qrc
     76
     77install_dev_files:unix {
     78    headers.path = /usr/include/smssender/gateways/Smartphone
     79    headers.files = $$HEADERS
     80    INSTALLS += headers
     81}
  • gateways/Sunrise/gui/sunrise-gui.pro

    r330 r342  
    2020    ../libsunrise-base$${LIB_SUFFIX}.$$EXT_STATICLIB
    2121
    22 HEADERS += \
     22HEADERS = \
    2323    sunrise.h \
    2424    ui/settingswidget.h \
    2525    business/account_tasks.h
    2626
    27 SOURCES += \
     27SOURCES = \
    2828    sunrise.cpp \
    2929    ui/settingswidget.cpp \
     
    3131    business/gateway.cpp
    3232
    33 FORMS += \
     33FORMS = \
    3434    ui/settingswidget.ui
    3535
    36 RESOURCES += \
     36RESOURCES = \
    3737    lib/sunrise-gui.qrc
  • gateways/Sunrise/sunrise-base.pro

    r341 r342  
    2828    ../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    2929
    30 HEADERS += \
     30install_dev_files:unix {
     31    target.path = /usr/lib/smssender/gateways
     32    INSTALLS += target
     33}
     34
     35HEADERS = \
    3136    business/contactimporter/contactimporter.h \
    3237    business/gateway.h \
     
    3742    business/account.h \
    3843
    39 SOURCES += \
     44SOURCES = \
    4045    business/account.cpp \
    4146    business/account_costs.cpp \
     
    4752    persistence/accountstoragehelper.cpp
    4853
    49 RESOURCES += \
     54RESOURCES = \
    5055    lib/sunrise.qrc
     56
     57install_dev_files:unix {
     58    headers.path = /usr/include/smssender/gateways/Sunrise
     59    headers.files = $$HEADERS
     60    INSTALLS += headers
     61}
  • gateways/common/gateways-common.pro

    r341 r342  
    2323    ../../lib$$COMMON$${LIB_SUFFIX}.$$EXT_DYNAMICLIB
    2424
    25 HEADERS += \
     25unix {
     26    target.path = /usr/lib/smssender
     27    INSTALLS += target
     28}
     29
     30HEADERS = \
    2631    business/baseaccount.h \
    2732    business/baseaccount_tasks.h \
     
    3237    persistence/defaultaccountstoragehelper.h
    3338
    34 SOURCES += \
     39SOURCES = \
    3540    business/baseaccount.cpp \
    3641    business/baseaccount_tasks.cpp \
     
    3843    business/defaultlogininittask.cpp \
    3944    persistence/defaultaccountstoragehelper.cpp
     45
     46install_dev_files:unix {
     47    headers.path = /usr/include/smssender/gateways/common
     48    headers.files = $$HEADERS
     49
     50    pri.path = /usr/include/smssender/gateways
     51    pri.files = ../gateways.pri
     52
     53    INSTALLS += headers pri
     54}
Note: See TracChangeset for help on using the changeset viewer.