diff options
| -rwxr-xr-x | ooo.lst | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | scp2/source/ooo/file_ooo.scp | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/file_resource_ooo.scp | 6 | ||||
| -rwxr-xr-x | scp2/source/ooo/module_lang_template.scp | 6 | ||||
| -rw-r--r-- | solenv/bin/transform_description.pl | 4 | ||||
| -rw-r--r-- | solenv/inc/extension_helplink.mk | 80 | ||||
| -rw-r--r-- | solenv/inc/extension_post.mk | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | solenv/inc/tg_help.mk | 30 | ||||
| -rwxr-xr-x | solenv/inc/tg_xmerge.mk | 17 |
9 files changed, 114 insertions, 41 deletions
@@ -69,7 +69,7 @@ fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz fcc6df1160753d0b8c835d17fdeeb0a7-boost_1_39_0.tar.gz fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz -fe5b3e2b7c4577f30dc001054365653e-dejavu-fonts-ttf-2.30.zip +37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip 831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2 diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 66cb1d60f..ed8c67d5e 100755..100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -391,12 +391,6 @@ STD_FILTER_FILE( gid_File_Filter_Iti, iti) STD_RES_FILE( gid_File_Res_Eps, eps ) -STD_RES_FILE( gid_File_Res_Egi, egi ) - -STD_RES_FILE( gid_File_Res_Ept, ept ) - -STD_RES_FILE( gid_File_Res_Eme, eme ) - File gid_File_Help_Common_Zip Dir = gid_Dir_Help_Isolanguage; ARCHIVE_TXT_FILE_BODY; diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index 9f2b40614..edaea2027 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -45,12 +45,6 @@ STD_RES_FILE( gid_File_Res_Dbw, dbw ) STD_RES_FILE( gid_File_Res_Dkt, dkt) -STD_RES_FILE( gid_File_Res_Epb, epb ) - -STD_RES_FILE( gid_File_Res_Epg, epg ) - -STD_RES_FILE( gid_File_Res_Epp, epp ) - STD_RES_FILE( gid_File_Res_Eur, eur ) STD_RES_FILE( gid_File_Res_Frm, frm) diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index 7ecd4747c..8ffeadc2e 100755 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -66,9 +66,6 @@ Module gid_Module_Langpack_Resource_Template gid_File_Res_Dbw, gid_File_Res_Dkt, gid_File_Res_Editeng, - gid_File_Res_Epb, - gid_File_Res_Epg, - gid_File_Res_Epp, gid_File_Res_Eur, gid_File_Res_For, gid_File_Res_Forui, @@ -110,9 +107,6 @@ Module gid_Module_Langpack_Resource_Template gid_File_Res_Stt, gid_File_Res_Tfu, gid_File_Res_Eps, - gid_File_Res_Egi, - gid_File_Res_Ept, - gid_File_Res_Eme, gid_File_Res_UpdChk, gid_File_Res_Upd); End diff --git a/solenv/bin/transform_description.pl b/solenv/bin/transform_description.pl index 021e1c0ac..b0d0ce7d3 100644 --- a/solenv/bin/transform_description.pl +++ b/solenv/bin/transform_description.pl @@ -55,9 +55,9 @@ sub parse_args # check which languages to use my $languages = $ENV{WITH_LANG}; - if ( ! defined $languages ) + if ( ( ! defined $languages ) || ( "$languages" eq "" ) ) { - print STDERR "$0: WITH_LANG not set, defaulting to 'en-US'\n"; + print STDERR "$0: WITH_LANG not set or empty, defaulting to 'en-US'\n"; $languages = "en-US"; } @languages = split ( ' ', $languages ); diff --git a/solenv/inc/extension_helplink.mk b/solenv/inc/extension_helplink.mk new file mode 100644 index 000000000..e375696bd --- /dev/null +++ b/solenv/inc/extension_helplink.mk @@ -0,0 +1,80 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +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$ + +.IF "$(SYSTEM_LUCENE)" == "YES" +my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR) +.ELSE +my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar +.ENDIF + +.IF "$(SYSTEM_DB)" != "YES" +JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) +.ENDIF + +#aux_alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL)))) +aux_alllangiso*:=$(alllangiso) + +######################################################### + + +HELPLINKALLTARGETS=$(foreach,i,$(aux_alllangiso) $(MISC)/$(TARGET)_$(LINKNAME)_$i.done) +HELPLINKALLADDEDDEPS=$(foreach,i,$(aux_alllangiso) $(subst,LANGUAGE,$i $(LINKADDEDDPES))) + +ALLTAR : $(HELPLINKALLTARGETS) + +.IF "$(SYSTEM_DB)" != "YES" +JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) +.ENDIF + +XSL_DIR*:=$(SOLARBINDIR) +XHPLINKSRC*:=$(XHPDEST) +STY_SWITCH:= -sty $(XSL_DIR)/embed.xsl + +.IF "$(XHPFILES)"!="" && "$(HELP_OUT)"!="" +$(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/{$(aux_alllangiso)}/$i) : $(HELP_OUT)/$(TARGET).done +LINKDEPS+=$(HELP_OUT)/xhp_changed.flag +.ENDIF # "$(XHPFILES)"!="" && "$(HELP_OUT)"!="" + +$(HELPLINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKDEPS)) + @echo Building help index for $(@:b:s/_/./:e:s/.//) + $(COMMAND_ECHO)$(HELPLINKER) -mod $(LINKNAME) -extlangsrc $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} $(STY_SWITCH) -extlangdest $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} -idxcaption $(XSL_DIR)/idxcaption.xsl -idxcontent $(XSL_DIR)/idxcontent.xsl $(LINKLINKFILES) + $(COMMAND_ECHO)cd $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} && zip -u -r $(LINKNAME).jar $(PACKAGE)/* $(CHECKZIPRESULT) +.IF "$(SOLAR_JAVA)" == "TRUE" +# cleanup index dir + -$(RM) $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))}/$(LINKNAME).idxl/* +.IF "$(CHECK_LUCENCE_INDEXER_OUTPUT)" == "" + $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -extension -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} && $(TOUCH) $@ +.ELSE + $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -extension -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} -checkcfsandsegname _0 _3 && $(TOUCH) $@ +.ENDIF +.ELSE + -$(RM) $(XHPLINKSRC)/$(@:b)/content/*.* + -$(RM) $(XHPLINKSRC)/$(@:b)/caption/*.* +.ENDIF + diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk index 47b62d20d..f221ff7eb 100644 --- a/solenv/inc/extension_post.mk +++ b/solenv/inc/extension_post.mk @@ -39,7 +39,11 @@ fixme4=$(fixme:n) $(EXTENSIONDIR)/$(COMPONENT_CONFIGDEST)/%.xcu : %.xcu # ugly hacking to workaround prepended first source path @@-$(MKDIRHIER) $(subst,$(fixme2),$(MISC) $(@:d)) +.IF "$(COMPONENT_XCU_REPLACEMENT)"!="" + $(TYPE) $< | sed '$(COMPONENT_XCU_REPLACEMENT)' > $(subst,$(fixme2),$(MISC) $@) +.ELSE # "$(COMPONENT_REPLACEMENT)"!="" $(GNUCOPY) $< $(subst,$(fixme2),$(MISC) $@) +.ENDIF # "$(COMPONENT_REPLACEMENT)"!="" $(EXTENSIONDIR)/$(COMPONENT_CONFIGDESTSCHEMA)/%.xcs : %.xcs @@-$(MKDIRHIER) $(subst,$(fixme4),$(MISC) $(@:d)) diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk index 89f1ebabe..cce5b9ee6 100755..100644 --- a/solenv/inc/tg_help.mk +++ b/solenv/inc/tg_help.mk @@ -31,23 +31,31 @@ aux_alllangiso*:=$(alllangiso) SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE)) -HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(COMMONMISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f))) -ALLTAR : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/xhp_changed.flag optix +.IF "$(XHPDEST)"=="" +XHPDEST*:=$(COMMONMISC) +HELP_OUT:=$(COMMONMISC) +.ELSE # "$(XHPDEST)"=="" +HELP_OUT:=$(MISC) +.ENDIF # "$(XHPDEST)"=="" + +HLANGXHPFILES*:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(XHPDEST)$/$j$/$(SHELL_PACKAGE)$/$(i:f))) + +ALLTAR : $(HELP_OUT)$/$(TARGET).done $(HELP_OUT)$/xhp_changed.flag optix $(HLANGXHPFILES) : $$(@:d)thisdir.created -$(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp +$(XHPDEST)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp @$(TOUCH) $@ # internal dependencies not sufficient to trigger merge? # @$(NULL) -$(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES) +$(HELP_OUT)$/$(TARGET).done : $(HLANGXHPFILES) .IF "$(WITH_LANG)"!="" - $(AUGMENT_LIBRARY_PATH) $(HELPEX) -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@ + $(AUGMENT_LIBRARY_PATH) $(HELPEX) -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(XHPDEST) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@ .ELSE # "$(WITH_LANG)"!="" - cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(COMMONMISC)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@ + cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(XHPDEST)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@ .ENDIF # "$(WITH_LANG)"!="" .IF "$(OS)"=="SOLARIS" @$(ECHONL) " " @@ -55,24 +63,24 @@ $(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES) @$(ECHONL) .ENDIF # "$(OS)"=="SOLARIS" -$(COMMONMISC)$/xhp_changed.flag : $(HLANGXHPFILES) +$(HELP_OUT)$/xhp_changed.flag : $(HLANGXHPFILES) @$(TOUCH) $@ # urks - dmake mixes up operators and strings :-( .IF "$(HLANGXHPFILES:s/defined/xxx/)"!="" .IF "$(HELPTRANSPHONY)"!="" -$(COMMONMISC)$/$(TARGET).done .PHONY : +$(HELP_OUT)$/$(TARGET).done .PHONY : .ELSE # "$(HELPTRANSPHONY)"!="" -$(COMMONMISC)$/$(TARGET).done : makefile.mk +$(HELP_OUT)$/$(TARGET).done : makefile.mk .IF "$(WITH_LANG)"!="" -$(COMMONMISC)$/$(TARGET).done : $(LOCALIZESDF) +$(HELP_OUT)$/$(TARGET).done : $(LOCALIZESDF) .ENDIF # "$(WITH_LANG)"!="" .ENDIF # "$(HELPTRANSPHONY)"!="" .ENDIF # "$(HLANGXHPFILES)"!="" -optix: $(COMMONMISC)$/$(TARGET).done +optix: $(HELP_OUT)$/$(TARGET).done @echo done %.created : diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk index fa3e22971..6ff412bb0 100755 --- a/solenv/inc/tg_xmerge.mk +++ b/solenv/inc/tg_xmerge.mk @@ -27,33 +27,32 @@ .IF "$(XTXFILES)"!="" -ALLTAR : $(MISC)/$(TARGET).xtx.pmerge.mk $(XTXFILES) +L10NEXT*=.txt +XTX_TARGET_PATH*=$(MISC)/$(TARGET) -.IF "$(L10NEXT)"=="" -L10NEXT:=.txt -.ENDIF +ALLTAR : $(XTX_TARGET_PATH).xtx.pmerge.mk $(XTXFILES) -$(MISC)/$(TARGET).xtx.pmerge.mk : $(XTXFILES) +$(XTX_TARGET_PATH).xtx.pmerge.mk : $(XTXFILES) $(XTXFILES) : $(LOCALIZESDF) -.INCLUDE .IGNORE : $(MISC)/$(TARGET).xtx.pmerge.mk +.INCLUDE .IGNORE : $(XTX_TARGET_PATH).xtx.pmerge.mk .IF "$(alllangiso)"!="$(last_merge)" XTXMERGEPHONY:=.PHONY .ENDIF # "$(alllangiso)" != "$(last_merge)" -$(MISC)/$(TARGET)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx +$(XTX_TARGET_PATH)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx @@-$(MKDIRHIER) $(@:d) .IF "$(WITH_LANG)"=="" - $(COMMAND_ECHO)$(COPY) $< $@ + $(COMMAND_ECHO)$(COPY) $< $(@:d)$(@:b)_en-US$(L10NEXT) .ELSE # "$(WITH_LANG)"=="" @@-$(RM) $@ $(COMMAND_ECHO)@noop $(assign XTXMERGELIST+:=$(<:f)) $(COMMAND_ECHO)@noop $(assign XTXDESTDIR:=$(@:d)) .ENDIF # "$(WITH_LANG)"=="" -$(MISC)/$(TARGET).xtx.pmerge.mk : $(XTXMERGELIST) +$(XTX_TARGET_PATH).xtx.pmerge.mk : $(XTXMERGELIST) .IF "$(WITH_LANG)"!="" # xtxex command file requirements: # - one file per line |