wangxin/help
1
0
Fork 0
forked from amazingfate/help
Code Pull Requests Activity

Merge commit 'libreoffice-3.4.0.2'

Browse Source
This commit is contained in:
Jan Holesovsky
2011-05-30 13:12:13 +02:00
parent 21c234bc56 0c8a27cfa9
commit e2b05042bc
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
helpcontent2/settings.pmk
View File

@ -1,4 +1,5 @@
.INCLUDE : $(LOCAL_COMMON_OUT)/inc$/aux_langs.mk
.INCLUDE : $(LOCAL_COMMON_OUT)/inc$/help_exist.mk
my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/HelpIndexerTool.jar$
@ -12,4 +13,5 @@ my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERA
JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
.ENDIF
aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL))))
aux_alllangiso_all:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL))))
aux_alllangiso:=$(foreach,i,$(aux_alllangiso_all) $(foreach,j,$(help_exist) $(eq,$i,$j $i $(NULL))))

8
helpcontent2/source/auxiliary/makefile.mk
View File

@ -46,7 +46,7 @@ TREEFILES = \
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
.EXPORT : LOCALIZESDF LOCALIZATION_FOUND TRYSDF
.EXPORT : LOCALIZESDF LOCALIZATION_FOUND TRYSDF L10N_MODULE
ALLTAR : aux_dirs $(COMMONMISC)$/treefiles.done $(COMMONBIN)$/helpimg.ilst
@ -54,8 +54,10 @@ ALLTAR : aux_dirs $(COMMONMISC)$/treefiles.done $(COMMONBIN)$/helpimg.ilst
t_aux_langdirs:=$(shell @find ./ -name "*.cfg" | sed "s/\.\/\///" | sed "s/\.\///" )
aux_langdirs:=$(uniq $(t_aux_langdirs:d:d))
help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US
aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL))))
aux_alllangiso_all:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL))))
aux_alllangiso:=$(foreach,i,$(aux_alllangiso_all) $(foreach,j,$(help_exist) $(eq,$i,$j $i $(NULL))))
WITH_LANG!:=$(aux_alllangiso)
@ -64,6 +66,7 @@ WITH_LANG!:=$(aux_alllangiso)
LOCTREEFILES:=$(foreach,i,$(aux_alllangiso) $(foreach,j,$(TREEFILES) $(COMMONMISC)$/$i$/$j))
.ELSE #IF "$(WITH_LANG)"!=""
aux_langdirs:=en-US
help_exist:=en-US
LOCTREEFILES:=$(foreach,j,$(TREEFILES) $(COMMONMISC)$/en-US$/$j)
.ENDIF #IF "$(WITH_LANG)"!=""
@ -92,6 +95,7 @@ $(LOCTREEFILES) : $(COMMONMISC)/unpack.done
aux_dirs .PHONY :
echo aux_langdirs:=$(aux_langdirs) > $(LOCAL_COMMON_OUT)/inc$/aux_langs.mk
echo help_exist:=$(help_exist) > $(LOCAL_COMMON_OUT)/inc$/help_exist.mk
$(COMMONBIN)$/helpimg.ilst .PHONY:
-$(RM) $@