Attachment #77477 for issue #119206

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




  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>

Lines 120-128 ZIP1EXT= .oxt Link Here

(-)a/main/sdext/source/presenter/makefile.mk (-14 / +5 lines)
120	ZIP1FLAGS=-r	120	ZIP1FLAGS=-r
121	ZIP1LIST= *	121	ZIP1LIST= *
122		122
		123	.INCLUDE : extension_pre.mk
		124
123	DESCRIPTION:=$(ZIP1DIR)$/description.xml	125	DESCRIPTION:=$(ZIP1DIR)$/description.xml
124		126
125	PACKLICS:=$(ZIP1DIR)$/registry$/LICENSE	127	PACKLICS:=$(ZIP1DIR)$/registration$/LICENSE
126		128
127	.IF "$(WITH_LANG)"==""	129	.IF "$(WITH_LANG)"==""
128	FIND_XCU=registry/data	130	FIND_XCU=registry/data
Lines 286-295 $(SLO)$/PresenterComponent.obj : $(INCCOM)$/PresenterExtensionIdentifier.hxx Link Here
286	$(INCCOM)$/PresenterExtensionIdentifier.hxx : PresenterExtensionIdentifier.txx	288	$(INCCOM)$/PresenterExtensionIdentifier.hxx : PresenterExtensionIdentifier.txx
287	$(TYPE) $< \| sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@	289	$(TYPE) $< \| sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
288		290
289	$(COMPONENT_MANIFEST) : $$(@:f)
290	@-$(MKDIRHIER) $(@:d)
291	+$(TYPE) $< \| $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" > $@
292
293	$(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)	291	$(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)
294	@@-$(MKDIRHIER) $(@:d)	292	@@-$(MKDIRHIER) $(@:d)
295	$(COPY) $< $@	293	$(COPY) $< $@
Lines 357-371 $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f) Link Here
357	.ENDIF #"$(COM)"=="GCC"	355	.ENDIF #"$(COM)"=="GCC"
358	.ENDIF	356	.ENDIF
359		357
360
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	358	$(ZIP1DIR)/%.xcu : %.xcu
370	@@-$(MKDIRHIER) $(@:d)	359	@@-$(MKDIRHIER) $(@:d)
371	$(GNUCOPY) $< $@	360	$(GNUCOPY) $< $@
Lines 374-379 $(ZIP1DIR)$/%.xcs : %.xcs Link Here
374	@@-$(MKDIRHIER) $(@:d)	363	@@-$(MKDIRHIER) $(@:d)
375	$(GNUCOPY) $< $@	364	$(GNUCOPY) $< $@
376		365
		366	.INCLUDE : extension_post.mk
		367
377	.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"	368	.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
378	.ELSE	369	.ELSE
379	ivo:	370	ivo:

Return to issue 119206

Lines 25-31 Link Here

(-)a/main/sdext/source/presenter/description.xml (-3 / +3 lines)
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>