[ooo-build-commit] .: 15 commits - ooo.lst solenv/bin solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Oct 6 07:09:29 PDT 2010
ooo.lst | 2
solenv/bin/mhids.pl | 6 ++
solenv/inc/extension_helplink.mk | 79 +++++++++++++++++++++++++++++++++++++++
solenv/inc/extension_post.mk | 4 +
solenv/inc/minor.mk | 4 -
solenv/inc/tg_help.mk | 22 ++++++----
6 files changed, 105 insertions(+), 12 deletions(-)
New commits:
commit cacf438a7a8e13156f8db8f12f65398484fc4679
Merge: 60e66e9... 59d84a6...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Oct 6 16:03:42 2010 +0200
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/bootstrap
commit 60e66e96db930be5b9e57b24954a201ac87374c5
Merge: 5a76e52... f8c90fc...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Oct 6 13:31:15 2010 +0200
Merge commit 'ooo/OOO330_m9'
Conflicts:
solenv/inc/minor.mk
diff --cc ooo.lst
index f8b64c1,f49780f..9c36366
mode 100644,100755..100644
--- a/ooo.lst
+++ b/ooo.lst
diff --cc solenv/inc/extension_helplink.mk
index 0000000,e375696..c9fa15e
mode 000000,100644..100644
--- a/solenv/inc/extension_helplink.mk
+++ b/solenv/inc/extension_helplink.mk
@@@ -1,0 -1,80 +1,79 @@@
+ #*************************************************************************
+ #
+ # 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
++.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 --cc solenv/inc/minor.mk
index 2068eb5,6172439..081bc79
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@@ -1,5 -1,5 +1,5 @@@
RSCVERSION=330
- RSCREVISION=330m7(Build:1)
-RSCREVISION=330m9(Build:9529)
-BUILD=9529
++RSCREVISION=330m9(Build:1)
+BUILD=1
- LAST_MINOR=m7
+ LAST_MINOR=m9
SOURCEVERSION=OOO330
commit f8c90fc30658854611f920e10873b8ec500e8937
Author: Release Engineering <releng at openoffice.org>
Date: Fri Sep 24 16:30:11 2010 +0200
OOO330
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 20070cd..6172439 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m8(Build:9527)
-BUILD=9527
-LAST_MINOR=m8
+RSCREVISION=330m9(Build:9529)
+BUILD=9529
+LAST_MINOR=m9
SOURCEVERSION=OOO330
commit 12022ffdb9622c0c3d701e93c38c07aa42f086cb
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Thu Sep 23 17:41:56 2010 +0200
masterfix: #i10000# fix for race condition
diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl
index cf023da..354416c 100644
--- a/solenv/bin/mhids.pl
+++ b/solenv/bin/mhids.pl
@@ -59,7 +59,10 @@ sub cleandie
print STDERR "$errstring\n";
if ( not $debug ) {
foreach my $i (@cleanuplist) {
- unlink "$workfile$i" if -f "$workfile$i" or print STDERR "ERROR - couldn't remove $workfile$i\n";
+# unlink "$workfile$i" if -f "$workfile$i" or print STDERR "ERROR - couldn't remove $workfile$i\n";
+ if ( -f "$workfile$i" ) {
+ unlink "$workfile$i" or print STDERR "ERROR - couldn't remove $workfile$i\n";
+ }
}
}
die "$erroreval\n";
@@ -387,6 +390,7 @@ rename("$srs/$filebase.hid.$ENV{INPATH}", "$srs/$filebase.hid") or cleandie("ERR
if ( not $debug ) {
foreach my $i (@cleanuplist) {
+ sleep 1;
if ( -f "$workfile$i" ) {
unlink "$workfile$i" or cleandie("");
}
commit 777b837b0e147d3606a529f4e92c10c3eb93c2ae
Author: obo <obo at openoffice.org>
Date: Wed Sep 15 10:27:11 2010 +0200
masterfix OOO330: #i10000# build problem (extensions help)
diff --git a/solenv/inc/extension_helplink.mk b/solenv/inc/extension_helplink.mk
index 907a1e0..e375696 100644
--- a/solenv/inc/extension_helplink.mk
+++ b/solenv/inc/extension_helplink.mk
@@ -56,10 +56,10 @@ XSL_DIR*:=$(SOLARBINDIR)
XHPLINKSRC*:=$(XHPDEST)
STY_SWITCH:= -sty $(XSL_DIR)/embed.xsl
-.IF "$(XHPFILES)"!=""
-$(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/{$(aux_alllangiso)}/$i) : $(COMMONMISC)/$(TARGET).done
-LINKDEPS+=$(COMMONMISC)/xhp_changed.flag
-.ENDIF # "$(XHPFILES)"!=""
+.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/.//)
diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk
index b665f2f..cce5b9e 100644
--- a/solenv/inc/tg_help.mk
+++ b/solenv/inc/tg_help.mk
@@ -31,11 +31,17 @@
aux_alllangiso*:=$(alllangiso)
SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE))
+
+.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 : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/xhp_changed.flag optix
+ALLTAR : $(HELP_OUT)$/$(TARGET).done $(HELP_OUT)$/xhp_changed.flag optix
$(HLANGXHPFILES) : $$(@:d)thisdir.created
@@ -45,7 +51,7 @@ $(XHPDEST)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp
# @$(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 $(XHPDEST) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
.ELSE # "$(WITH_LANG)"!=""
@@ -57,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 :
commit cb486aa7b9a6d7f2b581ad9f942c19264dbe9d8a
Author: Release Engineering <releng at openoffice.org>
Date: Tue Sep 14 13:56:30 2010 +0200
OOO330
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index d769c5b..20070cd 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m7(Build:9526)
-BUILD=9526
-LAST_MINOR=m7
+RSCREVISION=330m8(Build:9527)
+BUILD=9527
+LAST_MINOR=m8
SOURCEVERSION=OOO330
commit 845474b4af46a0602b87fbf7671360818482746a
Merge: 2bcc23d... 8594626...
Author: obo <obo at openoffice.org>
Date: Tue Sep 14 13:03:44 2010 +0200
CWS-TOOLING: integrate CWS jl158
commit 2bcc23da6f4f975ae201d04d0e3a9dcbd4d81907
Merge: a2d9f08... e6e6ff9...
Author: obo <obo at openoffice.org>
Date: Tue Sep 14 12:55:12 2010 +0200
CWS-TOOLING: integrate CWS ooo33gsl08
commit a2d9f08c320fb1319e4d72892bffeee1902993a8
Merge: e77fae2... 0470761...
Author: obo <obo at openoffice.org>
Date: Tue Sep 14 09:23:13 2010 +0200
CWS-TOOLING: integrate CWS impress199
commit e6e6ff94dfe3ae12bb8976d41c2fdf743b4a03e1
Author: Herbert Duerr [hdu] <herbert.duerr at oracle.com>
Date: Wed Sep 8 10:38:58 2010 +0200
#i114069# update DejaVu fonts to version 2.32
diff --git a/ooo.lst b/ooo.lst
index 9f51cf6..f49780f 100755
--- a/ooo.lst
+++ b/ooo.lst
@@ -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
commit 04707617502e403dabc0d085790d85bc3f58812b
Author: sj <sj at openoffice.org>
Date: Mon Sep 6 17:25:36 2010 +0200
impress199: #i114275# unbranding presentation minimizer extension
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 47b62d2..f221ff7 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))
commit 8594626b107043f3a1b9832696f57f161d2c39a6
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Fri Sep 3 14:12:57 2010 +0200
jl158: #i114008# make sure index directory is empty
diff --git a/solenv/inc/extension_helplink.mk b/solenv/inc/extension_helplink.mk
index 0a75218..907a1e0 100644
--- a/solenv/inc/extension_helplink.mk
+++ b/solenv/inc/extension_helplink.mk
@@ -66,6 +66,8 @@ $(HELPLINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/$$(@:b: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
commit 96af2133823ad895b7c8a91cb53fdc8c9406f69f
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Wed Sep 1 13:01:03 2010 +0200
jl158: #i114008# pre-indexing of extension help
diff --git a/solenv/inc/extension_helplink.mk b/solenv/inc/extension_helplink.mk
new file mode 100644
index 0000000..0a75218
--- /dev/null
+++ b/solenv/inc/extension_helplink.mk
@@ -0,0 +1,78 @@
+#*************************************************************************
+#
+# 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)"!=""
+$(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/{$(aux_alllangiso)}/$i) : $(COMMONMISC)/$(TARGET).done
+LINKDEPS+=$(COMMONMISC)/xhp_changed.flag
+.ENDIF # "$(XHPFILES)"!=""
+
+$(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"
+.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/tg_help.mk b/solenv/inc/tg_help.mk
index 89f1eba..b665f2f 100644
--- a/solenv/inc/tg_help.mk
+++ b/solenv/inc/tg_help.mk
@@ -31,13 +31,15 @@
aux_alllangiso*:=$(alllangiso)
SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE))
-HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(COMMONMISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f)))
+XHPDEST*:=$(COMMONMISC)
+
+HLANGXHPFILES*:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(XHPDEST)$/$j$/$(SHELL_PACKAGE)$/$(i:f)))
ALLTAR : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/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)
@@ -45,9 +47,9 @@ $(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp
$(COMMONMISC)$/$(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) " "
commit 092faddddaa3d473e6269104d0b8db11cc713a03
Merge: e644c89... 3c81bc6...
Author: Joachim Lingner <jl at openoffice.org>
Date: Tue Aug 24 10:01:56 2010 +0200
jl158 merging with OOO330_m5
commit e644c89f05addad71cf0ef2e8b96a081dab85d23
Merge: b2cf522... 743f394...
Author: Joachim Lingner <jl at openoffice.org>
Date: Fri Aug 13 17:01:44 2010 +0200
jl158 merging with jl154
More information about the ooo-build-commit
mailing list