From ooo-commits-return-9413-apmail-incubator-ooo-commits-archive=incubator.apache.org@incubator.apache.org Thu May 3 13:55:14 2012 Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3DF54C0C8 for ; Thu, 3 May 2012 13:55:14 +0000 (UTC) Received: (qmail 40208 invoked by uid 500); 3 May 2012 13:55:14 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 40170 invoked by uid 500); 3 May 2012 13:55:14 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 40163 invoked by uid 99); 3 May 2012 13:55:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 May 2012 13:55:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 May 2012 13:55:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4AC75238896F; Thu, 3 May 2012 13:54:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1333462 - in /incubator/ooo/trunk/main/sdext/source/presenter: description.xml makefile.mk Date: Thu, 03 May 2012 13:54:52 -0000 To: ooo-commits@incubator.apache.org From: hdu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120503135452.4AC75238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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"> - + @@ -34,13 +34,13 @@ - + - + Apache Software Foundation 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