Changeset 438 for trunk


Ignore:
Timestamp:
Apr 22, 2010, 11:32:23 AM (11 years ago)
Author:
dmik
Message:

Brushed up r436:437.

Location:
trunk
Files:
6 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r437 r438  
    88
    99#
    10 # Lucide version string
    11 # see README.DEV for the versioning scheme
     10# Lucide version string.
     11#
     12# This always has a format of X.Y.Z where each letter is a positive decimal
     13# number representing the major version, minor version and revision accordingly.
    1214#
    1315VERSION         = 1.3.2
     16
     17#
     18# Lucide build string.
     19#
     20# This is usually "beta" for the development phase and "GA" for the releases.
     21# See also GENERATING DISTRIBUTION ARCHIVES in README.DEV for more information.
     22#
    1423BUILD           = beta
    15 #
    16 # Lucide WPI build is only one char
     24
     25#
     26# Lucide build number for the WPI archive.
     27#
     28# By agreement, this number is 0 for "beta" builds and 1 for "GA" builds.
     29#
    1730WPIBUILD        = 0
    1831
    1932#
    20 # Lucide version date
     33# Lucide version date in the format YYYY-MM-DD.
    2134#
    2235VERSIONDATE     = 2010-xx-xx
  • trunk/Lucide/changelog

    r437 r438  
    1 1.32:
    2   - Fixed mismatch between the package names and actual plugins they contain.
     11.3.2:
     2  - WPI: Fixed mismatch between the package names and actual plugins they contain.
    33  - WPI: Fixed the version number.
    44  - WPI: Skip the WPS object creation dialog to avoid a possible WPS association
    55    inconsistency (closed ticket 128).
    6   - Renamed version from the x.yz to the x.y.z scheme
    7   - Added a BUILD string to the About Dialoge
     6  - Changed the versioning scheme from X.YZ to X.Y.Z.
    87
    98
  • trunk/Lucide/gui/aboutDlg.cpp

    r437 r438  
    3838#include <string.h>
    3939#include <malloc.h>
     40#include <string>
    4041
    4142#include "globals.h"
     
    115116                centerWindow( hWndFrame, hwnd );
    116117
    117                 char buf[ 256 ];
    118                 if (strlen(appDate) >=1)
    119                 {
    120                         snprintf( buf, sizeof buf, "%s %s %s (%s)", appName, appVersion, appBuild, appDate );
    121                 } else
    122                 {
    123                         snprintf( buf, sizeof buf, "%s %s %s", appName, appVersion, appBuild );
     118                std::string ver = appName;
     119                (ver += ' ') += appVersion;
     120                if ( strlen( appBuild ) > 0 ) {
     121                    (ver += ' ') += appBuild;
    124122                }
    125                 WinSetDlgItemText( hwnd, IDT_LUCIDEVERSION, buf );
     123                if ( strlen( appDate ) > 0 ) {
     124                    ((ver += " (") += appDate) += ')';
     125                }
     126                WinSetDlgItemText( hwnd, IDT_LUCIDEVERSION, ver.c_str() );
    126127
    127128                HPOINTER p = WinLoadPointer( HWND_DESKTOP, _hmod, IDP_HAND );
  • trunk/Lucide/gui/lucide.cpp

    r437 r438  
    8282const char *appName    = "Lucide";
    8383const char *appVersion = VERSION;
    84 const char *appBuild    = BUILD;
    85 const char *appDate = VERSIONDATE;
     84const char *appBuild   = BUILD;
     85const char *appDate    = VERSIONDATE;
    8686const char *prfFwp     = "FrameWindowPos";
    8787const char *prfLvd     = "LastViewedDir";
  • trunk/Makefile.kmk

    r437 r438  
    1818#
    1919
    20 PATH_OUT                ?= . # be on the safe side (we do rmdir -fR of PATH_PACKING)
    21 PATH_PACKING    = $(PATH_OUT)/packing
     20PATH_OUT        ?= . # be on the safe side (we do rmdir -fR of PATH_PACKING)
     21PATH_PACKING = $(PATH_OUT)/packing
    2222
    23 LUCIDE_WPI       = $(PATH_OUT)/Lucide-$(subst $(SP),_,$(subst .,_,$(VERSION)))_$(BUILD).wpi
    24 LUCIDE_ZIP       = $(PATH_OUT)/Lucide-$(subst $(SP),_,$(subst .,_,$(VERSION)))_$(BUILD).zip
     23FILE_VERSION = $(subst $(SP),_,$(subst .,_,$(VERSION)$(if $(BUILD),_$(BUILD))))
    2524
    26 OTHER_CLEAN     += $(LUCIDE_WPI) $(LUCIDE_ZIP) warpin/lucide_wpi.wis
     25LUCIDE_WPI       = $(PATH_OUT)/Lucide-$(FILE_VERSION).wpi
     26LUCIDE_ZIP       = $(PATH_OUT)/Lucide-$(FILE_VERSION).zip
     27
     28LUCIDE_WIS       = $(PATH_PACKING)/wpi/lucide.wis
     29
     30OTHER_CLEAN     += $(LUCIDE_WPI) $(LUCIDE_ZIP) $(LUCIDE_WIS)
    2731
    2832ifeq ($(IN_PACKING),)
     
    7175Lucide_wpi_4_SOURCES     = $(TARGET_lujpeg)
    7276
    73 $(LUCIDE_WPI): install warpin/lucide_wpi.wis
     77$(LUCIDE_WPI): $(LUCIDE_WIS) install
    7478        $(call MSG_L1,Packing $@)
    7579        -$(QUIET)$(RM) -f $@
     
    7882                $(foreach p,$(patsubst Lucide_wpi_%,%,$(filter Lucide_wpi_%,$(INSTALLS))),\
    7983                        $(p) -c$(abspathex $(Lucide_wpi_$(p)_INST),$(PATH_OUT)) \*) \
    80                 -s warpin/lucide_wpi.wis
     84                -s $(LUCIDE_WIS)
    8185
    82 warpin/lucide_wpi.wis: config.kmk warpin/lucide_wpi.wi_
    83         @echo Writing wis script
    84         $(SED) "s;_WPIVERSION_;$(subst .,\\\,$(VERSION));g" warpin/lucide_wpi.wi_ \
    85                 | $(SED) "s;_WPIBUILD_;$(WPIBUILD);g" \
    86                 > warpin/lucide_wpi.wis
     86$(LUCIDE_WIS): warpin/lucide.wis.tpl Config.kmk | $$(call DIRDEP,$$(@D))
     87        $(call MSG_L1,Generating $@)
     88        $(QUIET)$(SED) \
     89                -e "s;\\\$${WPIVERSION};$(subst .,\\\,$(VERSION));g" \
     90                -e "s;\\\$${WPIBUILD};$(WPIBUILD);g" \
     91                --output $@ $<
     92
     93BLDDIRS += $(dir $(LUCIDE_WIS))
    8794
    8895#
  • trunk/README.DEV

    r437 r438  
    8181the distribution archives from the existing build.
    8282
    83 IMPORTANT:
     83IMPORTANT (for the release builder):
    8484
    85     Do not forget to update VERSION, BUILD, VERSIONDATE and WPIBUILD in Config.kmk.
    86     The warpin/lucide_wpi.wis script gets created from the warpin/lucide_wpi.wi_ within
    87     the packing process. Don't forget to set the new VERSION... strings in config.kmk
    88     immediately after the release (after tagging the SVN trunk with the release
    89     tag) with assigning the beta state (see below).
    90 
    91     The version assignment scheme is as follows:
    92 
    93     * VERSION is set to "X.Y.Z" and BUILD "beta" for the development phase and to "X.Y.Z"
    94       and BUILD "GA" for releases.
    95 
    96     * The WarpIn version path is set to to X\Y\Z\0 for the development phase
    97       and to X\Y\Z\1 for releases.
     85    Do not forget to update VERSION, BUILD/WPIBUILD and VERSIONDATE in
     86    Config.kmk. Note that you should immediately increase the version number
     87    in SVN after the release (after tagging the SVN trunk with the release tag)
     88    and set BUILD to "beta" to indicate a new development phase. Right before
     89    the release, you end the development phase by changing BUILD from "beta"
     90    to "GA" and create a corresponding release tag in SVN.
    9891
    9992
  • trunk/warpin/lucide.wis.tpl

    r437 r438  
    112112</REXX>
    113113<PCK INDEX=1
    114      PACKAGEID="netlabs.org\Lucide\Lucide core\_WPIVERSION_\_WPIBUILD_"
     114     PACKAGEID="netlabs.org\Lucide\Lucide core\${WPIVERSION}\${WPIBUILD}"
    115115     TARGET="$(WARPIN_DEFAULTAPPSPATH)\Lucide"
    116116     BASE
     
    126126
    127127<PCK INDEX=2
    128      PACKAGEID="netlabs.org\Lucide\Lucide plugin PDF\_WPIVERSION_\_WPIBUILD_"
     128     PACKAGEID="netlabs.org\Lucide\Lucide plugin PDF\${WPIVERSION}\${WPIBUILD}"
    129129     TARGET="$(1)"
    130130     TITLE="=("plug_pdf")"
     
    134134
    135135<PCK INDEX=3
    136      PACKAGEID="netlabs.org\Lucide\Lucide plugin DJVU\_WPIVERSION_\_WPIBUILD_"
     136     PACKAGEID="netlabs.org\Lucide\Lucide plugin DJVU\${WPIVERSION}\${WPIBUILD}"
    137137     TARGET="$(1)"
    138138     TITLE="=("plug_djvu")"
     
    142142
    143143<PCK INDEX=4
    144      PACKAGEID="netlabs.org\Lucide\Lucide plugin JPEG\_WPIVERSION_\_WPIBUILD_"
     144     PACKAGEID="netlabs.org\Lucide\Lucide plugin JPEG\${WPIVERSION}\${WPIBUILD}"
    145145     TARGET="$(1)"
    146146     TITLE="=("plug_jpeg")"
Note: See TracChangeset for help on using the changeset viewer.