summaryrefslogtreecommitdiff
path: root/swext
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2010-10-06 13:35:21 +0200
committerJan Holesovsky <kendy@suse.cz>2010-10-06 13:35:21 +0200
commit542a0e91f425b05bc4fb402777f0068c2a8159f4 (patch)
tree778fad1d2f39e3b54584d2643cddf0fdc78a9d86 /swext
parent9cdba569d3b93b8b6ca6f655816236db503784a9 (diff)
parent1bf218731b864f73403a2cf653d8fd231f6e392f (diff)
Merge commit 'ooo/OOO330_m9'
Conflicts: swext/mediawiki/build.xml swext/prj/build.lst
Diffstat (limited to 'swext')
-rw-r--r--swext/mediawiki/build.xml16
-rw-r--r--swext/mediawiki/help/makefile.mk60
-rw-r--r--swext/prj/build.lst2
3 files changed, 43 insertions, 35 deletions
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
index 5e65177ad976..27167b1b1372 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">
@@ -148,6 +139,8 @@
<zipfileset dir="${solar.bin}/xslt/export/xsltml" casesensitive="yes" prefix="filter/math"/>
<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}/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>
@@ -160,14 +153,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="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/>
diff --git a/swext/mediawiki/help/makefile.mk b/swext/mediawiki/help/makefile.mk
index 1cb200a1860f..1804ec2b668a 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,27 @@ 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' | \
+ sed 's/@WIKIEXTENSIONID@/com.sun.wiki-publisher/g' | \
+ sed '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"
diff --git a/swext/prj/build.lst b/swext/prj/build.lst
index aa56c04f3448..2e96591abb03 100644
--- a/swext/prj/build.lst
+++ b/swext/prj/build.lst
@@ -1,4 +1,4 @@
-swext swext : officecfg l10n l10ntools javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml NULL
+swext swext : officecfg l10n l10ntools javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml xmlhelp NULL
swext swext usr1 - all swext_mkout NULL
swext swext\mediawiki\help nmake - all swext_mwhelp NULL
swext swext\mediawiki\src\registry\schema\org\openoffice\Office\Custom nmake - all swext_mwschema NULL