Attachment #77482 for issue #119206

View | Details | Raw Unified | Return to issue 119206
Collapse All | Expand All




++ b/main/sdext/source/presenter/description.xml

  xmlns:dep="http://openoffice.org/extensions/description/2006"
  xmlns:xlink="http://www.w3.org/1999/xlink">

  <identifier value="com.sun.PresenterScreen-UPDATED_SUPPORTED_PLATFORM" />

  <dependencies>
    <OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>


  <registration>
    <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
      <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
    </simple-license>
  </registration>

  <version value="1.2.0"/>

  <platform value="UPDATED_SUPPORTED_PLATFORM" />

  <publisher>
      <name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>




ZIP1FLAGS=-r
ZIP1LIST=		*

EXTENSIONDIR=$(ZIP1DIR)

.INCLUDE : extension_pre.mk

.IF "$(WITH_LANG)"==""
FIND_XCU=registry/data

    $(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						\

	$(ZIP1DIR)$/bitmaps$/extension_32.png \
	$(ZIP1DIR)$/bitmaps$/extension_32_h.png

COMPONENT_MANIFEST= 							\
	$(ZIP1DIR)$/META-INF$/manifest.xml

COMPONENT_LIBRARY= 								\
	$(ZIP1DIR)$/$(TARGET).uno$(DLLPOST)


$(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) $< $@

 .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

Return to issue 119206

Line Link Here

(-)file_not_specified_in_diff (-4 / +4 lines)
0	-- a/main/sdext/source/presenter/description.xml	0	++ b/main/sdext/source/presenter/description.xml
Lines 25-31 Link Here
25	xmlns:dep="http://openoffice.org/extensions/description/2006"	25	xmlns:dep="http://openoffice.org/extensions/description/2006"
26	xmlns:xlink="http://www.w3.org/1999/xlink">	26	xmlns:xlink="http://www.w3.org/1999/xlink">
27		27
28	<identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />	28	<identifier value="com.sun.PresenterScreen-UPDATED_SUPPORTED_PLATFORM" />
29		29
30	<dependencies>	30	<dependencies>
31	<OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>	31	<OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>
Lines 34-46 Link Here
34		34
35	<registration>	35	<registration>
36	<simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >	36	<simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
37	<license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>	37	<license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
38	</simple-license>	38	</simple-license>
39	</registration>	39	</registration>
40		40
41	<version value="1.2.0"/>	41	<version value="1.2.0"/>
42		42
43	<platform value="UPDATED_PLATFORM" />	43	<platform value="UPDATED_SUPPORTED_PLATFORM" />
44		44
45	<publisher>	45	<publisher>
46	<name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>	46	<name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>

Lines 120-128 ZIP1EXT= .oxt Link Here

(-)a/main/sdext/source/presenter/makefile.mk (-28 / +3 lines)
120	ZIP1FLAGS=-r	120	ZIP1FLAGS=-r
121	ZIP1LIST= *	121	ZIP1LIST= *
122		122
123	DESCRIPTION:=$(ZIP1DIR)$/description.xml	123	EXTENSIONDIR=$(ZIP1DIR)
124		124
125	PACKLICS:=$(ZIP1DIR)$/registry$/LICENSE	125	.INCLUDE : extension_pre.mk
126		126
127	.IF "$(WITH_LANG)"==""	127	.IF "$(WITH_LANG)"==""
128	FIND_XCU=registry/data	128	FIND_XCU=registry/data
Lines 136-144 COMPONENT_FILES= \ Link Here
136	$(ZIP1DIR)$/registry$/schema/org$/openoffice$/Office$/extension$/PresenterScreen.xcs \	136	$(ZIP1DIR)$/registry$/schema/org$/openoffice$/Office$/extension$/PresenterScreen.xcs \
137	$(ZIP1DIR)$/registry$/data/$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu	137	$(ZIP1DIR)$/registry$/data/$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu
138		138
139	#COMPONENT_MERGED_XCU= \
140	# $(FIND_XCU)$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu
141
142	COMPONENT_BITMAPS= \	139	COMPONENT_BITMAPS= \
143	$(ZIP1DIR)$/bitmaps$/BorderTop.png \	140	$(ZIP1DIR)$/bitmaps$/BorderTop.png \
144	$(ZIP1DIR)$/bitmaps$/BorderTopLeft.png \	141	$(ZIP1DIR)$/bitmaps$/BorderTopLeft.png \
Lines 240-248 COMPONENT_IMAGES=\ Link Here
240	$(ZIP1DIR)$/bitmaps$/extension_32.png \	237	$(ZIP1DIR)$/bitmaps$/extension_32.png \
241	$(ZIP1DIR)$/bitmaps$/extension_32_h.png	238	$(ZIP1DIR)$/bitmaps$/extension_32_h.png
242		239
243	COMPONENT_MANIFEST= \
244	$(ZIP1DIR)$/META-INF$/manifest.xml
245
246	COMPONENT_LIBRARY= \	240	COMPONENT_LIBRARY= \
247	$(ZIP1DIR)$/$(TARGET).uno$(DLLPOST)	241	$(ZIP1DIR)$/$(TARGET).uno$(DLLPOST)
248		242
Lines 286-295 $(SLO)$/PresenterComponent.obj : $(INCCOM)$/PresenterExtensionIdentifier.hxx Link Here
286	$(INCCOM)$/PresenterExtensionIdentifier.hxx : PresenterExtensionIdentifier.txx	280	$(INCCOM)$/PresenterExtensionIdentifier.hxx : PresenterExtensionIdentifier.txx
287	$(TYPE) $< \| sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@	281	$(TYPE) $< \| sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
288		282
289	$(COMPONENT_MANIFEST) : $$(@:f)
290	@-$(MKDIRHIER) $(@:d)
291	+$(TYPE) $< \| $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" > $@
292
293	$(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)	283	$(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)
294	@@-$(MKDIRHIER) $(@:d)	284	@@-$(MKDIRHIER) $(@:d)
295	$(COPY) $< $@	285	$(COPY) $< $@
Lines 357-378 $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f) Link Here
357	.ENDIF #"$(COM)"=="GCC"	347	.ENDIF #"$(COM)"=="GCC"
358	.ENDIF	348	.ENDIF
359		349
360		350	.INCLUDE : extension_post.mk
361	$(DESCRIPTION) : description.xml
362	@@-$(MKDIRHIER) $(@:d)
363	$(GNUCOPY) $< $@
364
365	$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE_ALv2
366	@@-$(MKDIRHIER) $(@:d)
367	$(GNUCOPY) $< $@
368
369	$(ZIP1DIR)/%.xcu : %.xcu
370	@@-$(MKDIRHIER) $(@:d)
371	$(GNUCOPY) $< $@
372
373	$(ZIP1DIR)$/%.xcs : %.xcs
374	@@-$(MKDIRHIER) $(@:d)
375	$(GNUCOPY) $< $@
376		351
377	.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"	352	.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
378	.ELSE	353	.ELSE