Author: hdu
Date: Thu Jun 7 08:43:09 2012
New Revision: 1347529
URL: http://svn.apache.org/viewvc?rev=1347529&view=rev
Log:
#i119206# use generic methods in presenter-console's makefile
Merged from: trunk@1333462, trunk@1336570
Patches by: Herbert Duerr, Andre Fischer
Suggested by: Herbert Duerr
Found by: Oliver Brinzing, Ariel Constenla-Haile
Modified:
incubator/ooo/branches/AOO34/ (props changed)
incubator/ooo/branches/AOO34/main/ (props changed)
incubator/ooo/branches/AOO34/main/sdext/source/presenter/description.xml
incubator/ooo/branches/AOO34/main/sdext/source/presenter/makefile.mk
Propchange: incubator/ooo/branches/AOO34/
------------------------------------------------------------------------------
Merged /incubator/ooo/trunk:r1333462,1336570
Propchange: incubator/ooo/branches/AOO34/main/
------------------------------------------------------------------------------
Merged /incubator/ooo/trunk/main:r1333462,1336570
Modified:
incubator/ooo/branches/AOO34/main/sdext/source/presenter/description.xml
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/sdext/source/presenter/description.xml?rev=1347529&r1=1347528&r2=1347529&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/sdext/source/presenter/description.xml
(original)
+++ incubator/ooo/branches/AOO34/main/sdext/source/presenter/description.xml
Thu Jun 7 08:43:09 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/branches/AOO34/main/sdext/source/presenter/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/sdext/source/presenter/makefile.mk?rev=1347529&r1=1347528&r2=1347529&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/sdext/source/presenter/makefile.mk
(original)
+++ incubator/ooo/branches/AOO34/main/sdext/source/presenter/makefile.mk Thu
Jun 7 08:43:09 2012
@@ -38,14 +38,21 @@ MAXLINELENGTH:=80000
PACKAGE=com.sun.PresenterScreen-$(PLATFORMID)
-.IF "$(L10N_framework)"==""
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
.IF "$(ENABLE_PRESENTER_SCREEN)" == "NO"
@all:
@echo "Presenter Screen build disabled."
.ELSE
+.IF "$(L10N_framework)" != ""
+
+@all:
+ @echo "L10N framework disabled => Presenter Screen can not be built."
+
+.ELSE
+
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
+
DLLPRE=
common_build_zip=
@@ -120,9 +127,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 +143,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 +244,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)
@@ -275,21 +276,15 @@ LINKLINKFILES= \
$(PACKAGE)/{$(my_XHPFILES)}
# --- Targets ----------------------------------
-.ENDIF # L10N_framework
.INCLUDE : target.mk
.INCLUDE : extension_helplink.mk
-.IF "$(L10N_framework)"==""
$(SLO)$/PresenterComponent.obj : $(INCCOM)$/PresenterExtensionIdentifier.hxx
$(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,26 +352,7 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:
.ENDIF #"$(COM)"=="GCC"
.ENDIF
+.INCLUDE : extension_post.mk
-$(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) $< $@
-
-.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
-.ELSE
-ivo:
- $(ECHO)
.ENDIF # L10N_framework
-
+.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
