diff options
Diffstat (limited to 'swext/mediawiki')
-rw-r--r-- | swext/mediawiki/build.xml | 16 | ||||
-rw-r--r-- | swext/mediawiki/help/makefile.mk | 58 |
2 files changed, 40 insertions, 34 deletions
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml index ff96fe578ca6..8dea0dce0bd2 100644 --- a/swext/mediawiki/build.xml +++ b/swext/mediawiki/build.xml @@ -123,15 +123,6 @@ <filter token="WIKIEXTENSIONFILENAME" value="${name}"/> </filterset> </copy> - <copy todir="${out}/misc/${target}/package_tmp/help" overwrite="true" encoding="UTF-8"> - <fileset dir="${out}/misc/${target}/help" includes="**/*.xhp" casesensitive="yes"/> - <filterset> - <filter token="WIKIEXTENSIONPRODUCTNAME" value="Wiki Publisher"/> - <filter token="WIKIEXTENSIONID" value="com.sun.wiki-publisher"/> - <filter token="WIKIEXTENSIONFILENAME" value="${name}"/> - </filterset> - <mapper type="regexp" from="^(.*[/\\])com.sun.sun-mediawiki([/\\].*)" to="\1com.sun.wiki-publisher\2"/> - </copy> </target> <target name="uno-package" depends="tmpdir, xcumerge, jar, init"> @@ -149,6 +140,8 @@ <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/> <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/> <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/> + <zipfileset dir="${out}/misc/${target}/help" includes="**/*.idxl/*,**/*.*_,**/*.jar" casesensitive="yes" prefix="help"/> + <zipfileset dir="${out}/misc/${target}/help" includes="**/*.xhp" casesensitive="yes" prefix="help"/> <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/> </zip> </target> @@ -161,14 +154,15 @@ <fileset dir="${out}/misc/${target}/registry/schema/org/openoffice/Office/Custom" includes="*.xcs" casesensitive="yes"/> <fileset dir="${out}/misc/${target}/registry/data/org/openoffice/Office" includes="ProtocolHandler.xcu,Paths.xcu" casesensitive="yes"/> <fileset dir="${out}/misc/${target}/merge/org/openoffice/Office/Custom" includes="*.xcu" casesensitive="yes"/> - <fileset dir="${out}/misc/${target}/merge/org/openoffice/Office" includes="*.xcu" casesensitive="yes"/> + <fileset dir="${out}/misc/${target}/merge/org/openoffice/Office" includes="*.xcu" excludes="**/ProtocolHandler.xcu,**/Paths.xcu" casesensitive="yes"/> <!-- FIXME: currently the build xcu files can not be used since the tag containing x-default attribute is thrown away, issue 99378 <fileset dir="${out}/misc/${target}/merge/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes"/> --> <fileset dir="src/registry/data/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes"/> <zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/> <zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/> - <zipfileset dir="${out}/misc/${target}/help" includes="**/*.xhp,component.txt" casesensitive="yes" prefix="help"/> + <zipfileset dir="${out}/misc/${target}/help" includes="component.txt" casesensitive="yes" prefix="help"/> + <zipfileset dir="${out}/misc/${target}_merge/help" includes="**/*.xhp" casesensitive="yes" prefix="help"/> <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/> <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/> <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/> diff --git a/swext/mediawiki/help/makefile.mk b/swext/mediawiki/help/makefile.mk index 1cb200a1860f..72608a80de0b 100644 --- a/swext/mediawiki/help/makefile.mk +++ b/swext/mediawiki/help/makefile.mk @@ -30,16 +30,29 @@ PRJNAME=swext TARGET=$(PRJNAME)_help .INCLUDE : settings.mk -.INCLUDE : target.mk - -.IF "$(ENABLE_MEDIAWIKI)" == "YES" -PACKAGE=com.sun.sun-mediawiki +.IF "$(WITH_LANG)"!="" # workaround for the problem in help, the help uses en instead of en-US -MEDIAWIKI_LANG= en $(alllangiso) +MEDIAWIKI_LANG=$(uniq en $(alllangiso)) +aux_alllangiso:=$(MEDIAWIKI_LANG) +.ELSE # "$(WITH_LANG)"!="" +aux_alllangiso:=$(defaultlangiso) +MEDIAWIKI_LANG=$(uniq en $(alllangiso)) +.ENDIF # "$(WITH_LANG)"!="" + +.IF "$(ENABLE_MEDIAWIKI)" != "YES" +all: + @echo Building mediawiki disabled... +.ELSE # "$(ENABLE_MEDIAWIKI)" != "YES" + +PACKAGE=com.sun.wiki-publisher -OUT_MEDIAWIKI=$(MISC)$/mediawiki -OUT_HELP=$(OUT_MEDIAWIKI)$/help +OUT_MEDIAWIKI:=$(MISC)$/mediawiki + +LINKNAME:=help +XHPLINKSRC:=$(OUT_MEDIAWIKI)/help + +XHPDEST=$(OUT_MEDIAWIKI)_merge/help XHPFILES= \ wiki.xhp\ @@ -48,26 +61,25 @@ XHPFILES= \ wikisend.xhp\ wikisettings.xhp -HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(MEDIAWIKI_LANG) $(OUT_HELP)$/$j$/$(PACKAGE)$/$(i:f))) +LINKLINKFILES= \ + $(PACKAGE)/{$(XHPFILES)} -ALLTAR : $(OUT_MEDIAWIKI)$/$(TARGET).done $(OUT_HELP)$/component.txt +# define with own language set +HLANGXHPFILES=$(foreach,i,$(XHPFILES) $(foreach,j,$(MEDIAWIKI_LANG) $(XHPDEST)$/$j$/$(PACKAGE)$/$(i:f))) -#$(OUT_MEDIAWIKI)$/xhp_changed.flag optix - -$(OUT_HELP)$/component.txt : component.txt - $(COPY) component.txt $(OUT_HELP)$/component.txt +.INCLUDE : target.mk +.INCLUDE : tg_help.mk +.INCLUDE : extension_helplink.mk -$(HLANGXHPFILES) : #$$(@:d)thisdir.created - -$(MKDIRHIER) $(@:d) - $(TOUCH) $(@:d)thisdir.created +ALLTAR : $(OUT_MEDIAWIKI)/help/component.txt -$(OUT_HELP)$/{$(MEDIAWIKI_LANG)}$/$(PACKAGE)$/%.xhp :| %.xhp - @$(TOUCH) $@ -# internal dependencies not sufficient to trigger merge? -# @$(NULL) +$(OUT_MEDIAWIKI)/help/component.txt : component.txt + @@-$(MKDIRHIER) $(@:d) + $(COMMAND_ECHO)$(COPY) component.txt $@ +$(OUT_MEDIAWIKI)/help/%.xhp : $(OUT_MEDIAWIKI)_merge/help/%.xhp + @@-$(MKDIRHIER) $(@:d) + $(COMMAND_ECHO)cat $< | sed -e 's/@WIKIEXTENSIONPRODUCTNAME@/Wiki Publisher/g ; s/@WIKIEXTENSIONID@/com.sun.wiki-publisher/g ; s/@WIKIEXTENSIONFILENAME@/wiki-publisher/g' > $@ -$(OUT_MEDIAWIKI)$/$(TARGET).done : $(LOCALIZESDF) $(XHPFILES) $(HLANGXHPFILES) - @$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(HELPEX) -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(OUT_HELP) -y $(PACKAGE) -l all -lf $(MEDIAWIKI_LANG:t",") -m $(LOCALIZESDF) && $(TOUCH) $@ -.ENDIF +.ENDIF # "$(ENABLE_MEDIAWIKI)" != "YES" |