Changeset 437 for trunk


Ignore:
Timestamp:
Apr 22, 2010, 10:11:00 AM (11 years ago)
Author:
Silvan Scherrer
Message:

build structure changes

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r436 r437  
    1111# see README.DEV for the versioning scheme
    1212#
    13 VERSION         = 1.32 beta
    14 #
    15 # Lucide WPI version strings
    16 WPIVERSION      = 1.3.2
     13VERSION         = 1.3.2
     14BUILD           = beta
     15#
     16# Lucide WPI build is only one char
    1717WPIBUILD        = 0
    1818
  • trunk/Lucide/changelog

    r435 r437  
    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
    68
    79
  • trunk/Lucide/gui/Makefile.kmk

    r406 r437  
    2121        lupoppler                                                                 \
    2222        ../plugins/ludoc $(PATH_Lucide_dll)/../ludoc
    23 Lucide_dll_CXXFLAGS      = -DVERSION="\"$(VERSION)\"" -DVERSIONDATE="\"$(VERSIONDATE)\""
     23Lucide_dll_CXXFLAGS      = -DVERSION="\"$(VERSION)\"" -DBUILD=\""$(BUILD)\"" -DVERSIONDATE="\"$(VERSIONDATE)\""
    2424Lucide_dll_DEFS.debug    = __TEST__
    2525Lucide_dll_SOURCES       = \
  • trunk/Lucide/gui/aboutDlg.cpp

    r385 r437  
    118118                if (strlen(appDate) >=1)
    119119                {
    120                         snprintf( buf, sizeof buf, "%s %s (%s)", appName, appVersion, appDate );
     120                        snprintf( buf, sizeof buf, "%s %s %s (%s)", appName, appVersion, appBuild, appDate );
    121121                } else
    122122                {
    123                         snprintf( buf, sizeof buf, "%s %s", appName, appVersion );
     123                        snprintf( buf, sizeof buf, "%s %s %s", appName, appVersion, appBuild );
    124124                }
    125125                WinSetDlgItemText( hwnd, IDT_LUCIDEVERSION, buf );
  • trunk/Lucide/gui/globals.h

    r385 r437  
    4141extern const char *appVersion;
    4242extern const char *appDate;
     43extern const char *appBuild;
    4344extern HAB hab;
    4445extern Environment *ev;
  • trunk/Lucide/gui/lucide.cpp

    r423 r437  
    8282const char *appName    = "Lucide";
    8383const char *appVersion = VERSION;
     84const char *appBuild    = BUILD;
    8485const char *appDate = VERSIONDATE;
    8586const char *prfFwp     = "FrameWindowPos";
  • trunk/Makefile.kmk

    r436 r437  
    2121PATH_PACKING     = $(PATH_OUT)/packing
    2222
    23 LUCIDE_WPI       = $(PATH_OUT)/Lucide-$(subst $(SP),_,$(subst .,_,$(VERSION))).wpi
    24 LUCIDE_ZIP       = $(PATH_OUT)/Lucide-$(subst $(SP),_,$(subst .,_,$(VERSION))).zip
     23LUCIDE_WPI       = $(PATH_OUT)/Lucide-$(subst $(SP),_,$(subst .,_,$(VERSION)))_$(BUILD).wpi
     24LUCIDE_ZIP       = $(PATH_OUT)/Lucide-$(subst $(SP),_,$(subst .,_,$(VERSION)))_$(BUILD).zip
    2525
    2626OTHER_CLEAN     += $(LUCIDE_WPI) $(LUCIDE_ZIP) warpin/lucide_wpi.wis
     
    8282warpin/lucide_wpi.wis: config.kmk warpin/lucide_wpi.wi_
    8383        @echo Writing wis script
    84         $(SED) "s;_WPIVERSION_;$(subst .,\\\,$(WPIVERSION));g" warpin/lucide_wpi.wi_ \
     84        $(SED) "s;_WPIVERSION_;$(subst .,\\\,$(VERSION));g" warpin/lucide_wpi.wi_ \
    8585                | $(SED) "s;_WPIBUILD_;$(WPIBUILD);g" \
    8686                > warpin/lucide_wpi.wis
  • trunk/README.DEV

    r433 r437  
    8383IMPORTANT:
    8484
    85     Do not forget to update VERSION and VERSIONDATE in Config.kmk and the
    86     version path in warpin/lucide_wpi.wis before the release and increase it
     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
    8788    immediately after the release (after tagging the SVN trunk with the release
    8889    tag) with assigning the beta state (see below).
     
    9091    The version assignment scheme is as follows:
    9192
    92     * VERSION is set to "X.YZ beta" for the development phase and to "X.YZ"
    93       for releases.
     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.
    9495
    9596    * The WarpIn version path is set to to X\Y\Z\0 for the development phase
Note: See TracChangeset for help on using the changeset viewer.