Changeset 147 in tspsg-svn

Timestamp:

Oct 25, 2010, 9:42:32 AM (14 years ago)

Author:

laleppa

Message:

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

Location:

trunk

Files:

• install.pri (modified) (1 diff)
• src/version.h (modified) (1 diff)
• tspsg.pro (modified) (1 diff)

trunk/install.pri

@@ -22 +22 @@
 #   - COPYING, ChangeLog.txt, README.txt and INSTALL.txt
 #     go to /usr/share/doc/TSPSG-x.x.x
-unix:!macx:!symbian {
+unix:!macx:!symbian:!maemo* {
         isEmpty(PREFIX) {
                 PREFIX = /usr

trunk/src/version.h

@@ -55 +55 @@
                 #define BUILD_STATUS (debug build BUILD_NUMBER)
         #else
-                #define BUILD_STATUS (BUILD_STATUS_TYPE BUILD_STATUS_NUMBER)
+                #define BUILD_STATUS (debug BUILD_STATUS_TYPE BUILD_STATUS_NUMBER)
         #endif
 #else

trunk/tspsg.pro

@@ -34 +34 @@
 BUILD_VERSION_MAJOR = 0
 BUILD_VERSION_MINOR = 1
-BUILD_RELEASE = 3
+BUILD_RELEASE = 4
 
 # These are only defined on releases
-DEFINES += TSPSG_RELEASE_BUILD
-DEFINES += BUILD_STATUS_TYPE=beta
-DEFINES += BUILD_STATUS_NUMBER=1
+#DEFINES += TSPSG_RELEASE_BUILD
+#DEFINES += BUILD_STATUS_TYPE=beta
+#DEFINES += BUILD_STATUS_NUMBER=1
 
-REVISION = 145
-#REVISION = $$system(svnversion)
-#isEmpty(REVISION)|eval(REVISION=="exported") {
-#       REVISION = 0
-#} else {
-#       REVISION = $$replace(REVISION,":","")
-#       REVISION = $$replace(REVISION,"M","")
-#}
+#REVISION = 145
+REVISION = $$system(svnversion)
+isEmpty(REVISION)|isEqual(REVISION,exported) {
+        REVISION = 0
+} else {
+        REVISION = $$replace(REVISION,":","")
+        REVISION = $$replace(REVISION,"M","")
+}
+SHORT_VERSION = $$sprintf("%1.%2",$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR)
 win32-msvc*|wincewm* {
-        VERSION = $$sprintf("%1.%2",$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR)
+        VERSION = $$SHORT_VERSION
 } else {
-        VERSION = $$sprintf("%1.%2.%3.%4",$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR,$$BUILD_RELEASE,$$REVISION)
+        VERSION = $$sprintf("%1.%2",$$SHORT_VERSION,$$BUILD_RELEASE)
 }