Changeset 711


Ignore:
Timestamp:
Oct 26, 2019, 9:31:40 PM (2 years ago)
Author:
Gregg Young
Message:

Build changes to add Polish lng file; Fixed lugbm-gcc.def generation Ticket #380; Fixed some grammar in the wis file.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r701 r711  
    1313# number representing the major version, minor version and revision accordingly.
    1414#
    15 VERSION         = 1.41
    16 GBMVERSION      = 1.44
     15VERSION         = 1.5.1
     16GBMVERSION      = 1.5.1
     17WPIVERSION      = 1.5.1
    1718
    1819#
     
    2223# See also GENERATING DISTRIBUTION ARCHIVES in README.DEV for more information.
    2324#
    24 BUILD           = GA
     25BUILD           = beta1
    2526
    2627#
     
    2930# By agreement, this number is 0 for "beta" builds and 1 for "GA" builds.
    3031#
    31 WPIBUILD        = 1
     32WPIBUILD        = 0
    3233
    3334#
    3435# Lucide version date in the format YYYY-MM-DD.
    3536#
    36 VERSIONDATE     = 2019-02-18
     37VERSIONDATE     = 2019-05-08
    3738
    3839#
    3940# Lucide version time used in build level strings set to any valid time
    4041#
    41 VERSIONTIME     = 01:41:00
     42VERSIONTIME     = 01:51:00
    4243
    4344#
  • trunk/Makefile.kmk

    r696 r711  
    2020PATH_PACKING = $(PATH_OUT)/dist/packing
    2121
    22 FILE_VERSION = $(subst $(SP),_,$(subst .,_,$(VERSION)$(if $(BUILD),_$(BUILD))))
     22FILE_VERSION = $(subst $(SP),_,$(subst .,_,$(WPIVERSION)$(if $(BUILD),_$(BUILD))))
    2323
    2424LUCIDE_WPI       = $(PATH_OUT)/Lucide-$(FILE_VERSION).wpi
     
    111111        $(call MSG_L1,Generating $@)
    112112        $(QUIET)$(SED) \
    113                 -e "s;\\\$${GBMVERSION};$(GBMVERSION);g" \
     113                -e "s;\\\$${VERSION};$(VERSION);g" \
     114                -e "s;\\\$${BUILD};$(BUILD);g" \
    114115                -e "s;\\\$${VERSIONDATE};$(VERSIONDATE);g" \
    115116                -e "s;\\\$${VERSIONTIME};$(VERSIONTIME);g" \
     
    145146                   Lucide_wpi_1049 Lucide_wpi_1031 Lucide_wpi_1034 \
    146147                   Lucide_wpi_1046 Lucide_wpi_1039 Lucide_wpi_1421 Lucide_wpi_1045 \
    147                    Lucide_wpi_1007 Lucide_wpi_1088 \
     148                   Lucide_wpi_1048 Lucide_wpi_1007 Lucide_wpi_1088 \
    148149                   Lucide_zip
    149150PACKING          = $(LUCIDE_WPI) $(LUCIDE_ZIP)
     
    219220Lucide_wpi_1045_SOURCES  = $(PATH_SUB_CURRENT)/Lucide/lng/Lucide_da.lng
    220221
     222Lucide_wpi_1048_INST             = $(notdir $(PATH_PACKING))/wpi/1048/
     223Lucide_wpi_1048_SOURCES  = $(PATH_SUB_CURRENT)/Lucide/lng/Lucide_pl.lng
     224
    221225Lucide_wpi_1007_INST             = $(notdir $(PATH_PACKING))/wpi/1007/
    222226Lucide_wpi_1007_SOURCES  = $(PATH_SUB_CURRENT)/Lucide/lng/Lucide_ru.lng
     
    238242        $(call MSG_L1,Generating $@)
    239243        $(QUIET)$(SED) \
    240                 -e "s;\\\$${VERSION};$(VERSION);g" \
    241                 -e "s;\\\$${BUILD};$(BUILD);g" \
    242                 -e "s;\\\$${WPIVERSION};$(subst .,\\\,$(VERSION));g" \
     244                -e "s;\\\$${VERSION};$(WPIVERSION);g" \
     245                -e "s;\\\$${BUILD};$(BUILD);g" \
     246                -e "s;\\\$${WPIVERSION};$(subst .,\\\,$(WPIVERSION));g" \
    243247                -e "s;\\\$${WPIBUILD};$(WPIBUILD);g" \
    244248                --output $@ $<
  • trunk/warpin/lucide.wis.tpl

    r701 r711  
    7777call RxFuncAdd 'SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs'
    7878call SysLoadFuncs
    79 langs = "EN,FR,DE,NL,ES,SV,IT,CS,DA,RU,ZH"
     79langs = "EN,FR,DE,NL,ES,SV,IT,CS,DA,RU,ZH,PL"
    8080lang = translate(left(strip(value("LANG",,"OS2ENVIRONMENT")),2))
    8181if pos(lang,langs) = 0 then lang = 'EN'
     
    153153    rc =WirexxPutEnv('accept','Please read and accept the following license-agreement.')
    154154    rc =WirexxPutEnv('target','Please select target directory.')
    155     rc =WirexxPutEnv('re_install','If you are updating the Lucide, the default installation directory will be the current directory.')
     155    rc =WirexxPutEnv('re_install','If you are updating Lucide, the default installation directory will be the current directory.')
    156156    rc =WirexxPutEnv('install','~Install')
    157157    rc =WirexxPutEnv('license','I ~accept')
     
    205205    rc =WirexxPutEnv('accept','Please read and accept the following license-agreement.')
    206206    rc =WirexxPutEnv('target','Please select target directory.')
    207     rc =WirexxPutEnv('re_install','If you are updating the Lucide, the default installation directory will be the current directory.')
     207    rc =WirexxPutEnv('re_install','If you are updating Lucide, the default installation directory will be the current directory.')
    208208    rc =WirexxPutEnv('install','~Install')
    209209    rc =WirexxPutEnv('license','I ~accept')
     
    228228    rc =WirexxPutEnv('plug_gbm','Lucide GBM plugin')
    229229    rc =WirexxPutEnv('readmetitle','ReadMe')
    230     rc =WirexxPutEnv('welcome','Welcome to the installation of the Lucide!')
    231     rc =WirexxPutEnv('accept','Please read and accept the following license-agreement.')
    232     rc =WirexxPutEnv('target','Please select target directory.')
    233     rc =WirexxPutEnv('re_install','If you are updating the Lucide, the default installation directory will be the current directory.')
     230    rc =WirexxPutEnv('welcome','Welcome to the installation of Lucide!')
     231    rc =WirexxPutEnv('accept','Please read and accept the following license-agreement.')
     232    rc =WirexxPutEnv('target','Please select target directory.')
     233    rc =WirexxPutEnv('re_install','If you are updating Lucide, the default installation directory will be the current directory.')
    234234    rc =WirexxPutEnv('install','~Install')
    235235    rc =WirexxPutEnv('license','I ~accept')
     
    254254    rc =WirexxPutEnv('plug_gbm','Lucide GBM plugin')
    255255    rc =WirexxPutEnv('readmetitle','ReadMe')
    256     rc =WirexxPutEnv('welcome','Welcome to the installation of the Lucide!')
    257     rc =WirexxPutEnv('accept','Please read and accept the following license-agreement.')
    258     rc =WirexxPutEnv('target','Please select target directory.')
    259     rc =WirexxPutEnv('re_install','If you are updating the Lucide, the default installation directory will be the current directory.')
     256    rc =WirexxPutEnv('welcome','Welcome to the installation of Lucide!')
     257    rc =WirexxPutEnv('accept','Please read and accept the following license-agreement.')
     258    rc =WirexxPutEnv('target','Please select target directory.')
     259    rc =WirexxPutEnv('re_install','If you are updating Lucide, the default installation directory will be the current directory.')
    260260    rc =WirexxPutEnv('install','~Install')
    261261    rc =WirexxPutEnv('license','I ~accept')
     
    280280    rc =WirexxPutEnv('plug_gbm','Lucide GBM plugin')
    281281    rc =WirexxPutEnv('readmetitle','ReadMe')
    282     rc =WirexxPutEnv('welcome','Welcome to the installation of the Lucide!')
    283     rc =WirexxPutEnv('accept','Please read and accept the following license-agreement.')
    284     rc =WirexxPutEnv('target','Please select target directory.')
    285     rc =WirexxPutEnv('re_install','If you are updating the Lucide, the default installation directory will be the current directory.')
     282    rc =WirexxPutEnv('welcome','Welcome to the installation of Lucide!')
     283    rc =WirexxPutEnv('accept','Please read and accept the following license-agreement.')
     284    rc =WirexxPutEnv('target','Please select target directory.')
     285    rc =WirexxPutEnv('re_install','If you are updating Lucide, the default installation directory will be the current directory.')
    286286    rc =WirexxPutEnv('install','~Install')
    287287    rc =WirexxPutEnv('license','I ~accept')
     
    306306    rc =WirexxPutEnv('plug_gbm','Lucide GBM plugin')
    307307    rc =WirexxPutEnv('readmetitle','ReadMe')
    308     rc =WirexxPutEnv('welcome','Welcome to the installation of the Lucide!')
    309     rc =WirexxPutEnv('accept','Please read and accept the following license-agreement.')
    310     rc =WirexxPutEnv('target','Please select target directory.')
    311     rc =WirexxPutEnv('re_install','If you are updating the Lucide, the default installation directory will be the current directory.')
     308    rc =WirexxPutEnv('welcome','Welcome to the installation of Lucide!')
     309    rc =WirexxPutEnv('accept','Please read and accept the following license-agreement.')
     310    rc =WirexxPutEnv('target','Please select target directory.')
     311    rc =WirexxPutEnv('re_install','If you are updating Lucide, the default installation directory will be the current directory.')
    312312    rc =WirexxPutEnv('install','~Install')
    313313    rc =WirexxPutEnv('license','I ~accept')
     
    323323    rc =WirexxPutEnv('ru_sel','SELECT DESELECT')
    324324  end
     325  when lang = 'PL' Then Do
     326                    /* Translate */
     327    rc =WirexxPutEnv('title','Lucide Document Viewer')
     328    rc =WirexxPutEnv('uguide','Lucide User Guide')
     329    rc =WirexxPutEnv('plug_pdf','Lucide PDF plugin')
     330    rc =WirexxPutEnv('plug_djvu','Lucide DjVu plugin')
     331    rc =WirexxPutEnv('plug_jpeg','Lucide JPEG plugin')
     332    rc =WirexxPutEnv('plug_gbm','Lucide GBM plugin')
     333    rc =WirexxPutEnv('readmetitle','ReadMe')
     334    rc =WirexxPutEnv('welcome','Welcome to the installation of Lucide!')
     335    rc =WirexxPutEnv('accept','Please read and accept the following license-agreement.')
     336    rc =WirexxPutEnv('target','Please select target directory.')
     337    rc =WirexxPutEnv('re_install','If you are updating Lucide, the default installation directory will be the current directory.')
     338    rc =WirexxPutEnv('install','~Install')
     339    rc =WirexxPutEnv('license','I ~accept')
     340    rc =WirexxPutEnv('next','~Next')
     341    rc =WirexxPutEnv('nextText','Select "Next" to continue.')
     342    rc =WirexxPutEnv('cancelText','Select "Cancel" to abort installation.')
     343    rc =WirexxPutEnv('installText','Press "Install" in order to start installation of this archive.')
     344                    /* End Translate */
     345    rc =WirexxPutEnv('pkgnum','1')
     346                    /* Update us if this translation is added */
     347    rc =WirexxPutEnv('readme','readme')
     348    rc =WirexxPutEnv('lucidehelp','lucide_en.hlp+gbm_en.hlp')
     349    rc =WirexxPutEnv('pl_sel','SELECT DESELECT')
     350  end 
    325351  when lang = 'ZH' Then Do
    326352                    /* Translate */
     
    332358    rc =WirexxPutEnv('plug_gbm','Lucide GBM plugin')
    333359    rc =WirexxPutEnv('readmetitle','ReadMe')
    334     rc =WirexxPutEnv('welcome','Welcome to the installation of the Lucide!')
    335     rc =WirexxPutEnv('accept','Please read and accept the following license-agreement.')
    336     rc =WirexxPutEnv('target','Please select target directory.')
    337     rc =WirexxPutEnv('re_install','If you are updating the Lucide, the default installation directory will be the current directory.')
     360    rc =WirexxPutEnv('welcome','Welcome to the installation of Lucide!')
     361    rc =WirexxPutEnv('accept','Please read and accept the following license-agreement.')
     362    rc =WirexxPutEnv('target','Please select target directory.')
     363    rc =WirexxPutEnv('re_install','If you are updating Lucide, the default installation directory will be the current directory.')
    338364    rc =WirexxPutEnv('install','~Install')
    339365    rc =WirexxPutEnv('license','I ~accept')
     
    357383    rc =WirexxPutEnv('plug_gbm','Lucide GBM plugin')
    358384    rc =WirexxPutEnv('readmetitle','ReadMe')
    359     rc =WirexxPutEnv('welcome','Welcome to the installation of the Lucide!')
    360     rc =WirexxPutEnv('accept','Please read and accept the following license-agreement.')
    361     rc =WirexxPutEnv('target','Please select target directory.')
    362     rc =WirexxPutEnv('re_install','If you are updating the Lucide, the default installation directory will be the current directory.')
     385    rc =WirexxPutEnv('welcome','Welcome to the installation of Lucide!')
     386    rc =WirexxPutEnv('accept','Please read and accept the following license-agreement.')
     387    rc =WirexxPutEnv('target','Please select target directory.')
     388    rc =WirexxPutEnv('re_install','If you are updating Lucide, the default installation directory will be the current directory.')
    363389    rc =WirexxPutEnv('install','~Install')
    364390    rc =WirexxPutEnv('license','I ~accept')
     
    433459
    434460<PCK INDEX=5
    435      PACKAGEID="netlabs.org\Lucide\Lucide plugin GBM\1\4\4\0"
     461     PACKAGEID="netlabs.org\Lucide\Lucide plugin GBM\${WPIVERSION}\${WPIBUILD}"
    436462     TARGET="$(1)"
    437463     TITLE="=("get_env plug_gbm")"
     
    562588     =("get_env it_sel")
    563589     >Italian language support files for Lucide.</PCK>
     590     
     591<PCK INDEX=1048
     592     PACKAGEID="netlabs.org\Lucide\Polish\${WPIVERSION}\${WPIBUILD"
     593     TITLE="Polish"
     594     TARGET="$(1)"
     595     FIXED
     596     CREATEOBJECT='WPFolder|=("get_env title")|<WP_DESKTOP>|OBJECTID=<LUCIDEFOLDER>;TITLE==("get_env title");ICONFILE=$(1)\lucide_fldr_1.ico;ICONNFILE=1,$(1)\lucide_fldr_2.ico;OPEN=DEFAULT;ALWAYSSORT=YES;'
     597     CREATEOBJECT='WPProgram|Lucide|<LUCIDEFOLDER>|EXENAME=$(1)\lucide.exe;OBJECTID=<LUCIDEFOLDER_LUCIDEEXE>;TITLE==("get_env prog");PROGTYPE=PM;STARTUPDIR=$(1);ASSOCFILTER=*.PDF,*.DJVU;ASSOCTYPE=Acrobat Document;CCVIEW=YES;'
     598     CREATEOBJECT="REPLACE WPProgram|=("get_env uguide")|<LUCIDEFOLDER>|EXENAME=view.exe;OBJECTID=<LUCIDEFOLDER_GUIDE>;TITLE==("get_env uguide");PROGTYPE=PM;PARAMETERS==("get_env lucidehelp");STARTUPDIR=$(1);"
     599     CREATEOBJECT='WPProgram|=("get_env readmetitle")|<LUCIDEFOLDER>|EXENAME=e.exe;OBJECTID=<LUCIDEFOLDER_READMEIT>;TITLE==("get_env readmetitle");PROGTYPE=PM;PARAMETERS=$(1)\readme;STARTUPDIR=$(1);'
     600     CREATEOBJECT='WPProgram|Changelog|<LUCIDEFOLDER>|EXENAME=e.exe;OBJECTID=<LUCIDEFOLDER_CHANGELOG>;TITLE=Changelog;PROGTYPE=PM;PARAMETERS=$(1)\changelog;STARTUPDIR=$(1);'
     601     =("get_env pl_sel")
     602     >Polish language support files for Lucide.</PCK>     
    564603
    565604<PCK INDEX=1421
Note: See TracChangeset for help on using the changeset viewer.