[Libreoffice-commits] .: mysqlc/source reportbuilder/util

Tor Lillqvist tml at kemper.freedesktop.org
Fri Jul 1 05:40:24 PDT 2011


 mysqlc/source/makefile.mk      |    4 ----
 reportbuilder/util/makefile.mk |    4 ----
 2 files changed, 8 deletions(-)

New commits:
commit 56c3aed0ea66036a82a2cd1b17699aeff567e50d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jul 1 15:39:23 2011 +0300

    Goodbye to CWS_WORK_STAMP

diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk
old mode 100755
new mode 100644
index 8ffa8e1..9af646c
--- a/mysqlc/source/makefile.mk
+++ b/mysqlc/source/makefile.mk
@@ -45,11 +45,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS = TRUE
 
 #---- extension version
 EXTENSION_VERSION_BASE=$(MYSQLC_VERSION_MAJOR).$(MYSQLC_VERSION_MINOR).$(MYSQLC_VERSION_MICRO)
-.IF ( "$(CWS_WORK_STAMP)" == "" ) || ( "$(UPDATER)" == "YES" )
     EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
-.ELSE
-    EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).cws.$(CWS_WORK_STAMP)
-.ENDIF
 
 #---- extension title package name
 .IF "$(MYSQLC_STATUS)" == "final"
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index 21e30f4..d78cfa6 100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -30,11 +30,7 @@ PRJNAME=reportbuilder
 TARGET=rpt
 EXTENSION_VERSION_BASE=1.2.1
 
-.IF "$(CWS_WORK_STAMP)" == ""
     EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
-.ELSE
-    EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).cws.$(CWS_WORK_STAMP)
-.ENDIF
 
 # --- Settings ----------------------------------
 .INCLUDE :  makefile.pmk


More information about the Libreoffice-commits mailing list