Author: hdu
Date: Thu May 3 13:54:51 2012
New Revision: 1333462
URL: http://svn.apache.org/viewvc?rev=1333462&view=rev
Log:
#i119206# use generic methods in presenter-console's makefile
Modified:
incubator/ooo/trunk/main/sdext/source/presenter/description.xml
incubator/ooo/trunk/main/sdext/source/presenter/makefile.mk
Modified: incubator/ooo/trunk/main/sdext/source/presenter/description.xml
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sdext/source/presenter/description.xml?rev=1333462&r1=1333461&r2=1333462&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sdext/source/presenter/description.xml (original)
+++ incubator/ooo/trunk/main/sdext/source/presenter/description.xml Thu May 3
13:54:51 2012
@@ -25,7 +25,7 @@
xmlns:dep="http://openoffice.org/extensions/description/2006";
xmlns:xlink="http://www.w3.org/1999/xlink";>
- <identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />
+ <identifier value="com.sun.PresenterScreen-UPDATED_SUPPORTED_PLATFORM" />
<dependencies>
<OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>
@@ -34,13 +34,13 @@
<registration>
<simple-license accept-by="admin" default-license-id="lic-en-US"
suppress-if-required="true" >
- <license-text xlink:href="license/LICENSE" lang="isocode"
license-id="lic-isocode"/>
+ <license-text xlink:href="licensefile" lang="isocode"
license-id="lic-isocode"/>
</simple-license>
</registration>
<version value="1.2.0"/>
- <platform value="UPDATED_PLATFORM" />
+ <platform value="UPDATED_SUPPORTED_PLATFORM" />
<publisher>
<name xlink:href="http://www.openoffice.org"; lang="en">Apache Software
Foundation</name>
Modified: incubator/ooo/trunk/main/sdext/source/presenter/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sdext/source/presenter/makefile.mk?rev=1333462&r1=1333461&r2=1333462&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sdext/source/presenter/makefile.mk (original)
+++ incubator/ooo/trunk/main/sdext/source/presenter/makefile.mk Thu May 3
13:54:51 2012
@@ -120,9 +120,9 @@ ZIP1EXT= .oxt
ZIP1FLAGS=-r
ZIP1LIST= *
-DESCRIPTION:=$(ZIP1DIR)$/description.xml
+EXTENSIONDIR=$(ZIP1DIR)
-PACKLICS:=$(ZIP1DIR)$/registry$/LICENSE
+.INCLUDE : extension_pre.mk
.IF "$(WITH_LANG)"==""
FIND_XCU=registry/data
@@ -136,9 +136,6 @@ COMPONENT_FILES=
\
$(ZIP1DIR)$/registry$/schema/org$/openoffice$/Office$/extension$/PresenterScreen.xcs
\
$(ZIP1DIR)$/registry$/data/$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu
-#COMPONENT_MERGED_XCU= \
-# $(FIND_XCU)$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu
-
COMPONENT_BITMAPS=
\
$(ZIP1DIR)$/bitmaps$/BorderTop.png
\
$(ZIP1DIR)$/bitmaps$/BorderTopLeft.png
\
@@ -240,9 +237,6 @@ COMPONENT_IMAGES=\
$(ZIP1DIR)$/bitmaps$/extension_32.png \
$(ZIP1DIR)$/bitmaps$/extension_32_h.png
-COMPONENT_MANIFEST= \
- $(ZIP1DIR)$/META-INF$/manifest.xml
-
COMPONENT_LIBRARY=
\
$(ZIP1DIR)$/$(TARGET).uno$(DLLPOST)
@@ -286,10 +280,6 @@ $(SLO)$/PresenterComponent.obj : $(INCCO
$(INCCOM)$/PresenterExtensionIdentifier.hxx : PresenterExtensionIdentifier.txx
$(TYPE) $< | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
-$(COMPONENT_MANIFEST) : $$(@:f)
- @-$(MKDIRHIER) $(@:d)
- +$(TYPE) $< | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" > $@
-
$(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
@@ -357,22 +347,7 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:
.ENDIF #"$(COM)"=="GCC"
.ENDIF
-
-$(DESCRIPTION) : description.xml
- @@-$(MKDIRHIER) $(@:d)
- $(GNUCOPY) $< $@
-
-$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE_ALv2
- @@-$(MKDIRHIER) $(@:d)
- $(GNUCOPY) $< $@
-
-$(ZIP1DIR)/%.xcu : %.xcu
- @@-$(MKDIRHIER) $(@:d)
- $(GNUCOPY) $< $@
-
-$(ZIP1DIR)$/%.xcs : %.xcs
- @@-$(MKDIRHIER) $(@:d)
- $(GNUCOPY) $< $@
+.INCLUDE : extension_post.mk
.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
.ELSE
