Changeset 734


Ignore:
Timestamp:
May 13, 2010, 4:59:59 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

packaging: Updated WPI rules to include all new modules, demos and examples and the documentation.

Location:
packaging
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • packaging/Makefile.packages

    r732 r734  
    5353pkg.lib.runtime.PATH            = $(WPI_ROOT)/pkg.lib.runtime
    5454pkg.lib.runtime.SOURCES         = \
     55    $(QT_INSTALL)/bin/QtCLuc4.dll \
    5556    $(QT_INSTALL)/bin/QtCore4.dll \
    5657    $(QT_INSTALL)/bin/QtGui4.dll \
     58    $(QT_INSTALL)/bin/QtHelp4.dll \
    5759    $(QT_INSTALL)/bin/QtNet4.dll \
    5860    $(QT_INSTALL)/bin/QtScri4.dll \
    … …  
    6163    $(QT_INSTALL)/bin/QtSvg4.dll \
    6264    $(QT_INSTALL)/bin/QtTest4.dll \
     65    $(QT_INSTALL)/bin/QtWebK4.dll \
    6366    $(QT_INSTALL)/bin/QtXml4.dll \
    6467    $(QT_INSTALL)/bin/QtXmlP4.dll
    … …  
    7073pkg.lib.plugins.PATH            = $(WPI_ROOT)/pkg.lib.plugins
    7174pkg.lib.plugins.SOURCES         = \
    72     $(addsuffix ->accessible/,  $(wildcard $(QT_INSTALL)/plugins/accessible/*.dll)) \
    73     $(addsuffix ->codecs/,      $(wildcard $(QT_INSTALL)/plugins/codecs/*.dll)) \
    74     $(addsuffix ->iconengines/, $(wildcard $(QT_INSTALL)/plugins/iconengines/*.dll)) \
    75     $(addsuffix ->imageformats/,$(wildcard $(QT_INSTALL)/plugins/imageformats/*.dll)) \
    76     $(addsuffix ->sqldrivers/,  $(wildcard $(QT_INSTALL)/plugins/sqldrivers/*.dll))
     75    $(addsuffix ->accessible/,          $(wildcard $(QT_INSTALL)/plugins/accessible/*.dll)) \
     76    $(addsuffix ->codecs/,              $(wildcard $(QT_INSTALL)/plugins/codecs/*.dll)) \
     77    $(addsuffix ->graphicssystems/, $(wildcard $(QT_INSTALL)/plugins/graphicssystems/*.dll)) \
     78    $(addsuffix ->iconengines/,         $(wildcard $(QT_INSTALL)/plugins/iconengines/*.dll)) \
     79    $(addsuffix ->imageformats/,        $(wildcard $(QT_INSTALL)/plugins/imageformats/*.dll)) \
     80    $(addsuffix ->sqldrivers/,          $(wildcard $(QT_INSTALL)/plugins/sqldrivers/*.dll))
    7781
    7882pkg.lib.translations.PATH               = $(WPI_ROOT)/pkg.lib.translations
    7983pkg.lib.translations.SOURCES    = \
    80         $(filter-out $(wildcard $(QT_INSTALL)/translations/qt_help*.qm),\
    81                                  $(wildcard $(QT_INSTALL)/translations/qt_*.qm))
     84        $(wildcard $(QT_INSTALL)/translations/qt_*.qm) \
     85        $(wildcard $(QT_INSTALL)/translations/qt_help_*.qm)
    8286
    8387pkg.lib.systray.PATH            = $(WPI_ROOT)/pkg.lib.systray
    … …  
    99103#
    100104
    101 # @todo QtDsgn4.dll and QtDsgC4.dll must be taken from $(QT_INSTALL)
    102 # on the next release
    103 
    104105pkg.dev.libraries.PATH          = $(WPI_ROOT)/pkg.dev.libraries
    105106pkg.dev.libraries.SOURCES       = \
    106         $(addsuffix ->bin/,     $(wildcard $(QT_INSTALL)/bin/*.exe)) \
     107        $(addsuffix ->bin/,     $(filter-out \
     108                %/qtdemo.exe, \
     109                $(wildcard $(QT_INSTALL)/bin/*.exe))) \
    107110        $(addsuffix ->lib/,     $(wildcard $(QT_INSTALL)/lib/*.lib)) \
    108111        $(addsuffix ->lib/,     $(wildcard $(QT_INSTALL)/lib/*.prl)) \
    … …  
    117120pkg.dev.runtime.PATH            = $(WPI_ROOT)/pkg.dev.runtime
    118121pkg.dev.runtime.SOURCES         = \
    119         $(QT_BUILD)/bin/QtDsgn4.dll \
    120         $(QT_BUILD)/bin/QtDsgC4.dll
     122        $(QT_INSTALL)/bin/QtAsCl4.dll \
     123        $(QT_INSTALL)/bin/QtDsgn4.dll \
     124        $(QT_INSTALL)/bin/QtDsgC4.dll
     125
     126pkg.dev.plugins.PATH            = $(WPI_ROOT)/pkg.dev.plugins
     127pkg.dev.plugins.SOURCES         = \
     128    $(QT_INSTALL)/plugins/designer/qwebview.dll->designer/
    121129
    122130pkg.dev.translations.PATH               = $(WPI_ROOT)/pkg.dev.translations
    123131pkg.dev.translations.SOURCES    = \
    124132        $(wildcard $(QT_INSTALL)/translations/designer_*.qm) \
    125         $(wildcard $(QT_INSTALL)/translations/linguist_*.qm)
     133        $(wildcard $(QT_INSTALL)/translations/linguist_*.qm) \
     134        $(wildcard $(QT_INSTALL)/translations/assistant_*.qm)
    126135
    127136wpi.dev.PATH            = $(OUT_ROOT)/qt-dev-$(QT_VER_FULL).wpi
    … …  
    130139        pkg.dev.libraries=1 \
    131140        pkg.dev.runtime=2 \
    132     pkg.dev.translations=3 \
    133         pkg.readme=4
     141        pkg.dev.plugins=3 \
     142    pkg.dev.translations=4 \
     143        pkg.readme=5
    134144
    135145#
    … …  
    139149pkg.examples.demos.PATH         = $(WPI_ROOT)/pkg.examples.demos
    140150pkg.examples.demos.SOURCES      = \
    141         $(wildcard $(QT_INSTALL)/demos/*/) \
     151        $(wildcard $(QT_INSTALL)/demos/*/)
    142152
    143153pkg.examples.demo-plugins.PATH          = $(WPI_ROOT)/pkg.examples.demo-plugins
    … …  
    149159        $(wildcard $(QT_INSTALL)/examples/*/) \
    150160
    151 # @todo add examples.example-plugins
    152 # @todo install qtdemo in bin/ when it's ready
     161pkg.examples.example-plugins.PATH               = $(WPI_ROOT)/pkg.examples.example-plugins
     162pkg.examples.example-plugins.SOURCES    = \
     163        $(QT_INSTALL)/plugins/designer/cntrext.dll->designer/ \
     164        $(QT_INSTALL)/plugins/designer/cstmwgt.dll->designer/ \
     165        $(QT_INSTALL)/plugins/designer/tskmext.dll->designer/ \
     166        $(QT_INSTALL)/plugins/designer/wrldclk.dll->designer/
     167
     168pkg.examples.qtdemo.PATH                        = $(WPI_ROOT)/pkg.examples.qtdemo
     169pkg.examples.qtdemo.SOURCES                     = \
     170        $(QT_INSTALL)/bin/qtdemo.exe
    153171
    154172wpi.examples.PATH               = $(OUT_ROOT)/qt-examples-$(QT_VER_FULL).wpi
    … …  
    158176        pkg.examples.demo-plugins=2 \
    159177        pkg.examples.examples=3 \
    160         pkg.readme=4
     178        pkg.examples.example-plugins=4 \
     179        pkg.examples.qtdemo=5 \
     180        pkg.readme=6
     181
     182#
     183# Documentation archive
     184#
     185
     186pkg.doc.qch.PATH                = $(WPI_ROOT)/pkg.doc.qch
     187pkg.doc.qch.SOURCES             = \
     188        $(wildcard $(QT_INSTALL)/doc/qch/)
     189
     190wpi.doc.PATH            = $(OUT_ROOT)/qt-doc-$(QT_VER_FULL).wpi
     191wpi.doc.SCRIPT          = $(WPI_ROOT)/doc.wis
     192wpi.doc.PACKAGES        = \
     193        pkg.doc.qch=1 \
     194        pkg.readme=2
    161195
    162196#
    … …  
    164198#
    165199
    166 WPIS = wpi.lib wpi.dev wpi.examples
     200WPIS = wpi.lib wpi.dev wpi.examples wpi.doc
    167201
    168202#-------------------------------------------------------------------------------

  • packaging/dev.wis.tpl

    r544 r734  
    1717     CREATEOBJECT="WPProgram|Designer|<QT4_FOLDER>|EXENAME=$(1)\bin\designer.exe;OBJECTID=<QT4_DESIGNER>;"
    1818     CREATEOBJECT="WPProgram|Linguist|<QT4_FOLDER>|EXENAME=$(1)\bin\linguist.exe;OBJECTID=<QT4_LINGUIST>;"
     19     CREATEOBJECT="WPProgram|Assistant|<QT4_FOLDER>|EXENAME=$(1)\bin\assistant.exe;OBJECTID=<QT4_ASSISTANT>;"
    1920     CREATEOBJECT="WPProgram|PixelTool|<QT4_FOLDER>|EXENAME=$(1)\bin\pixeltool.exe;OBJECTID=<QT4_PIXELTOOL>;"
    2021     CREATEOBJECT="WPProgram|Qt Readme|<QT4_FOLDER>|EXENAME=e.exe;PROGTYPE=PROG_PM;PARAMETERS=$(4)\README;STARTUPDIR=$(4);OPEN=RUNNING;OBJECTID=<QT4_README>;"
    … …  
    3839
    3940<PCK INDEX=3
     41     PACKAGEID="netlabs.org\Qt4\Development Plugins\${version_path}"
     42     TITLE="Plugins"
     43     ESELECT
     44     REQUIRES="2"
     45     REQUIRES="netlabs.org\Qt4\Plugins\${version_path}"
     46     TARGET="$(netlabs.org\Qt4\Plugins)" FIXED
     47     LONGFILENAMES
     48>Contains plugins for development tools</PCK>
     49
     50<PCK INDEX=4
    4051     PACKAGEID="netlabs.org\Qt4\Development Translations\${version_path}"
    4152     TITLE="Translations"
    … …  
    4758>Contains translations of the Qt development tools. This package is recommended</PCK>
    4859
    49 <PCK INDEX=4
     60<PCK INDEX=5
    5061     PACKAGEID="netlabs.org\Qt4\Readme\${version_path}"
    5162     TITLE="Readmes and Licenses"
    … …  
    97108More information about Qt licensing models is available at http://qt.nokia.com/products/licensing/</TEXT>
    98109
    99 <README FORMAT=FLOW EXTRACTFROMPCK="4">LICENSE.LGPL</README>
     110<README FORMAT=FLOW EXTRACTFROMPCK="5">LICENSE.LGPL</README>
    100111</PAGE>
    101112
    … …  
    107118By pressing the "I agree" button, you agree to all terms and conditions to either the below license agreement or to the license agreement shown on the previous page, or to both.</TEXT>
    108119
    109 <README FORMAT=FLOW EXTRACTFROMPCK="4">LICENSE.GPL3</README>
     120<README FORMAT=FLOW EXTRACTFROMPCK="5">LICENSE.GPL3</README>
    110121</PAGE>
    111122

  • packaging/examples.wis.tpl

    r544 r734  
    1616     LONGFILENAMES
    1717     EXECUTE="$(netlabs.org\Qt4\Installation Utilities)\util\UpdateQtSysConf.cmd|Demos=$(1)"
    18      CREATEOBJECT="WPShadow|Demos|<QT4_FOLDER>|SHADOWID=$(1);OBJECTID=<QT4_DEMOS>;"
    1918>Contains the executables and the source code of the Qt demo applications</PCK>
    2019
    … …  
    2322     TITLE="Demo Plugins"
    2423     SELECT
    25      REQUIRES="netlabs.org\Qt4\Demos\${version_path}"
     24     REQUIRES="1"
    2625     REQUIRES="netlabs.org\Qt4\Plugins\${version_path}"
    2726     TARGET="$(netlabs.org\Qt4\Plugins)" FIXED
    … …  
    3837     LONGFILENAMES
    3938     EXECUTE="$(netlabs.org\Qt4\Installation Utilities)\util\UpdateQtSysConf.cmd|Examples=$(3)"
    40      CREATEOBJECT="WPShadow|Examples|<QT4_FOLDER>|SHADOWID=$(3);OBJECTID=<QT4_EXAMPLES>;"
    4139>Contains the executables and the source code of the Qt example applications</PCK>
    4240
    4341<PCK INDEX=4
     42     PACKAGEID="netlabs.org\Qt4\Example Plugins\${version_path}"
     43     TITLE="Example Plugins"
     44     SELECT
     45     REQUIRES="3"
     46     REQUIRES="netlabs.org\Qt4\Plugins\${version_path}"
     47     TARGET="$(netlabs.org\Qt4\Plugins)" FIXED
     48     LONGFILENAMES
     49>Contains the example plugins</PCK>
     50
     51<PCK INDEX=5
     52     PACKAGEID="netlabs.org\Qt4\QtDemo\${version_path}"
     53     TITLE="Example and Demo Launcher"
     54     SELECT
     55     REQUIRES="1"
     56     REQUIRES="2"
     57     REQUIRES="3"
     58     REQUIRES="4"
     59     REQUIRES="netlabs.org\Qt4\Development\${version_path}"
     60     TARGET="$(netlabs.org\Qt4\Development)\bin" FIXED
     61     LONGFILENAMES
     62     CREATEOBJECT="WPProgram|Examples and Demos|<QT4_FOLDER>|EXENAME=$(5)\qtdemo.exe;OBJECTID=<QT4_DEMO>;"
     63>Contains the Qt example and demo launcher application</PCK>
     64
     65<PCK INDEX=6
    4466     PACKAGEID="netlabs.org\Qt4\Readme\${version_path}"
    4567     TITLE="Readmes and Licenses"
    … …  
    91113More information about Qt licensing models is available at http://qt.nokia.com/products/licensing/</TEXT>
    92114
    93 <README FORMAT=FLOW EXTRACTFROMPCK="4">LICENSE.LGPL</README>
     115<README FORMAT=FLOW EXTRACTFROMPCK="6">LICENSE.LGPL</README>
    94116</PAGE>
    95117
    … …  
    101123By pressing the "I agree" button, you agree to all terms and conditions to either the below license agreement or to the license agreement shown on the previous page, or to both.</TEXT>
    102124
    103 <README FORMAT=FLOW EXTRACTFROMPCK="4">LICENSE.GPL3</README>
     125<README FORMAT=FLOW EXTRACTFROMPCK="6">LICENSE.GPL3</README>
    104126</PAGE>
    105127

  • packaging/lib.wis.tpl

    r723 r734  
    189189     TARGET="=("GetSysAppPath")\Qt4"
    190190     LONGFILENAMES
    191 >Contains installation utilities. This package is required. The installation directory of this package serves as a base directory for all other Qt packages except Runtime</PCK>
     191>Contains installation utilities. This package is required. The installation directory of this package serves as a base directory for all other Qt packages except Runtime, as well as for other Qt 4 installation archives ("dev", "examples" and "doc")</PCK>
    192192
    193193<PCK INDEX=3

  • packaging/make_packages.cmd

    r721 r734  
    336336    call ReplaceInFile 'dev.wis.tpl', G.OutDirWpi'\dev.wis', 'G.vars'
    337337    call ReplaceInFile 'examples.wis.tpl', G.OutDirWpi'\examples.wis', 'G.vars'
     338    call ReplaceInFile 'doc.wis.tpl', G.OutDirWpi'\doc.wis', 'G.vars'
    338339
    339340    drop G.vars.
    … …  
    345346        call Done 1
    346347    if (Exec('make -f Makefile.packages wpi.examples', G.ScriptDir, '>'G.LogFile) \= 0) then
     348        call Done 1
     349    if (Exec('make -f Makefile.packages wpi.doc', G.ScriptDir, '>'G.LogFile) \= 0) then
    347350        call Done 1
    348351
Note: See TracChangeset for help on using the changeset viewer.