Changeset 147 in tspsg-svn


Ignore:
Timestamp:
Oct 25, 2010, 9:42:32 AM (13 years ago)
Author:
laleppa
Message:

Made some tweaks/fixes to the project files...

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/install.pri

    r144 r147  
    2222#   - COPYING, ChangeLog.txt, README.txt and INSTALL.txt
    2323#     go to /usr/share/doc/TSPSG-x.x.x
    24 unix:!macx:!symbian {
     24unix:!macx:!symbian:!maemo* {
    2525        isEmpty(PREFIX) {
    2626                PREFIX = /usr
  • trunk/src/version.h

    r145 r147  
    5555                #define BUILD_STATUS (debug build BUILD_NUMBER)
    5656        #else
    57                 #define BUILD_STATUS (BUILD_STATUS_TYPE BUILD_STATUS_NUMBER)
     57                #define BUILD_STATUS (debug BUILD_STATUS_TYPE BUILD_STATUS_NUMBER)
    5858        #endif
    5959#else
  • trunk/tspsg.pro

    r145 r147  
    3434BUILD_VERSION_MAJOR = 0
    3535BUILD_VERSION_MINOR = 1
    36 BUILD_RELEASE = 3
     36BUILD_RELEASE = 4
    3737
    3838# These are only defined on releases
    39 DEFINES += TSPSG_RELEASE_BUILD
    40 DEFINES += BUILD_STATUS_TYPE=beta
    41 DEFINES += BUILD_STATUS_NUMBER=1
     39#DEFINES += TSPSG_RELEASE_BUILD
     40#DEFINES += BUILD_STATUS_TYPE=beta
     41#DEFINES += BUILD_STATUS_NUMBER=1
    4242
    43 REVISION = 145
    44 #REVISION = $$system(svnversion)
    45 #isEmpty(REVISION)|eval(REVISION=="exported") {
    46 #       REVISION = 0
    47 #} else {
    48 #       REVISION = $$replace(REVISION,":","")
    49 #       REVISION = $$replace(REVISION,"M","")
    50 #}
     43#REVISION = 145
     44REVISION = $$system(svnversion)
     45isEmpty(REVISION)|isEqual(REVISION,exported) {
     46        REVISION = 0
     47} else {
     48        REVISION = $$replace(REVISION,":","")
     49        REVISION = $$replace(REVISION,"M","")
     50}
     51SHORT_VERSION = $$sprintf("%1.%2",$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR)
    5152win32-msvc*|wincewm* {
    52         VERSION = $$sprintf("%1.%2",$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR)
     53        VERSION = $$SHORT_VERSION
    5354} else {
    54         VERSION = $$sprintf("%1.%2.%3.%4",$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR,$$BUILD_RELEASE,$$REVISION)
     55        VERSION = $$sprintf("%1.%2",$$SHORT_VERSION,$$BUILD_RELEASE)
    5556}
    5657
Note: See TracChangeset for help on using the changeset viewer.