Tag: cws_dev300_dba31c User: fs Date: 2008-09-04 06:52:33+0000 Modified: dba/reportdesign/util/description.xml dba/reportdesign/util/makefile.mk
Log: in non-product builds, use the build ID additional to the version identifier File Changes: Directory: /dba/reportdesign/util/ ================================== File [changed]: description.xml Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/description.xml?r1=1.7&r2=1.7.2.1 Delta lines: +1 -1 ------------------- --- description.xml 2008-08-19 10:20:24+0000 1.7 +++ description.xml 2008-09-04 06:52:30+0000 1.7.2.1 @@ -11,7 +11,7 @@ <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/> </simple-license> </registration> - <version value="1.0.6"/> + <version value="#VERSION#"/> <identifier value="com.sun.reportdesigner"/> <dependencies> <OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0"/> File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/reportdesign/util/makefile.mk?r1=1.21&r2=1.21.2.1 Delta lines: +18 -4 -------------------- --- makefile.mk 2008-08-19 10:20:51+0000 1.21 +++ makefile.mk 2008-09-04 06:52:30+0000 1.21.2.1 @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.21.2.1 $ # # This file is part of OpenOffice.org. # @@ -37,6 +37,13 @@ GEN_HID=TRUE GEN_HID_OTHER=TRUE +EXTENSION_VERSION_BASE=1.0.9 +.IF "$(PRODUCT)" != "" + EXTENSION_VERSION=$(EXTENSION_VERSION_BASE) +.ELSE + EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).$(BUILD) +.ENDIF + # --- Settings ---------------------------------- .INCLUDE : makefile.pmk @@ -202,8 +209,12 @@ .IF "$(SOLAR_JAVA)"!="" -XMLFILES = $(EXTENSIONDIR)$/description.xml \ - $(EXTENSIONDIR)$/META-INF$/manifest.xml +XMLFILES = $(EXTENSIONDIR)$/META-INF$/manifest.xml + +# DESCRIPTION_SRC is the source file which is copied into the extension +# It is defaulted to "descriptio.xml", but we want to pre-process it, so we use an intermediate +# file +DESCRIPTION_SRC = $(MISC)$/description.xml COMPONENT_MERGED_XCU= \ $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Setup.xcu \ @@ -284,6 +295,9 @@ @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ +$(DESCRIPTION_SRC): description.xml + $(TYPE) description.xml | $(SED) s/#VERSION#/$(EXTENSION_VERSION)/> $@ + .ELSE # "$(SOLAR_JAVA)"!="" .INCLUDE : target.mk .ENDIF # "$(SOLAR_JAVA)"!="" --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
