[ooo-build-commit] Branch 'ooo/master' - sdext/prj sdext/source swext/mediawiki swext/prj
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Jun 17 17:27:16 PDT 2009
sdext/prj/build.lst | 5 +-
sdext/source/presenter/makefile.mk | 20 +++++++---
sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk | 6 +--
sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs | 1
swext/mediawiki/help/makefile.mk | 8 ++--
swext/prj/build.lst | 2 -
6 files changed, 26 insertions(+), 16 deletions(-)
New commits:
commit 7f6d3cfdc31f69247cee4241b31d354caaf7f4c3
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Jun 17 13:15:46 2009 +0000
CWS-TOOLING: integrate CWS l10ncleanup04
2009-05-28 13:46:54 +0200 ihi r272407 : remove forgotten sdf's
2009-05-25 22:32:35 +0200 ihi r272273 : no WITH_LANG fix
2009-05-25 20:45:58 +0200 ihi r272272 : remove some comments
2009-05-25 19:55:21 +0200 ihi r272271 : svx dialog -> cui l10n move
2009-05-25 18:30:58 +0200 ihi r272268 : build fix
2009-05-18 16:32:02 +0200 ihi r272033 : bash fix
2009-05-18 16:31:32 +0200 ihi r272032 : bash fix
2009-05-14 16:23:39 +0200 ihi r271901 : #i79750# Translation moved to l10n module
2009-05-11 23:36:05 +0200 ihi r271793 : #i79750# Translation moved into own module
diff --git a/sdext/prj/build.lst b/sdext/prj/build.lst
index 394925c..9d99c11 100644
--- a/sdext/prj/build.lst
+++ b/sdext/prj/build.lst
@@ -1,11 +1,12 @@
-dx sdext : offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg vcl XPDF:xpdf LIBXSLT:libxslt NULL
+dx sdext : l10n offuh comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg vcl XPDF:xpdf LIBXSLT:libxslt NULL
dx sdext usr1 - all sdext_mkout NULL
dx sdext\prj get - all sdext_prj NULL
dx sdext\source\minimizer nmake - all sdext_minimizer sdext_minimizer_rdoooe sdext_minimizer_rdooo sdext_minimizer_rdooou sdext_inc NULL
dx sdext\source\minimizer\registry\data\org\openoffice\Office\extension nmake - all sdext_minimizer_rdoooe NULL
dx sdext\source\minimizer\registry\data\org\openoffice\Office\UI nmake - all sdext_minimizer_rdooou NULL
dx sdext\source\minimizer\registry\data\org\openoffice\Office nmake - all sdext_minimizer_rdooo NULL
-dx sdext\source\presenter nmake - all sdext_presenter sdext_inc NULL
+dx sdext\source\presenter\registry\data\org\openoffice\Office\extension nmake - all sdext_presenter_xcu NULL
+dx sdext\source\presenter nmake - all sdext_presenter sdext_inc sdext_presenter_xcu NULL
dx sdext\inc nmake - all sdext_inc NULL
dx sdext\source\pdfimport\xpdfwrapper nmake - all dx_xpdfwrap NULL
dx sdext\source\pdfimport\xpdftest nmake - all dx_parsetest dx_xpdfwrap NULL
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 083db8e..04b13a2 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -33,7 +33,7 @@ PRJ=..$/..
PRJNAME=sdext
TARGET=PresenterScreen
GEN_HID=FALSE
-EXTNAME=presenter
+EXTNAME=PresenterScreen
ENABLE_EXCEPTIONS=TRUE
@@ -121,13 +121,21 @@ PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/license_$i)
PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/LICENSE_$i)
.ENDIF
+.IF "$(WITH_LANG)"==""
+FIND_XCU=registry/data
+.ELSE # "$(WITH_LANG)"==""
+FIND_XCU=$(MISC)$/$(EXTNAME)_in$/merge
+.ENDIF # "$(WITH_LANG)"==""
COMPONENT_FILES= \
$(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/Jobs.xcu \
$(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/ProtocolHandler.xcu \
- $(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu \
- $(ZIP1DIR)$/registry$/schema/org$/openoffice$/Office$/extension$/PresenterScreen.xcs
+ $(ZIP1DIR)$/registry$/schema/org$/openoffice$/Office$/extension$/PresenterScreen.xcs \
+ $(ZIP1DIR)$/registry$/data/$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu
+
+#COMPONENT_MERGED_XCU= \
+# $(FIND_XCU)$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu
COMPONENT_BITMAPS= \
$(ZIP1DIR)$/bitmaps$/BorderTop.png \
@@ -243,6 +251,7 @@ ZIP1DEPS= \
$(COMPONENT_BITMAPS) \
$(COMPONENT_LIBRARY) \
$(COMPONENT_HELP)
+# $(COMPONENT_MERGED_XCU) \
PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l)
@@ -265,8 +274,8 @@ $(COMPONENT_HELP) : help$/$$(@:f)
$(COPY) $< $@
#$(COMPONENT_FILES) : $$(@:f)
-# @-$(MKDIRHIER) $(@:d)
-# +$(COPY) $< $@
+# -$(MKDIRHIER) $(@:d)
+# $(COPY) $< $@
$(COMPONENT_BITMAPS) : bitmaps$/$$(@:f)
@-$(MKDIRHIER) $(@:d)
@@ -328,6 +337,7 @@ $(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
$(GNUCOPY) $< $@
.ENDIF
+
$(ZIP1DIR)/%.xcu : %.xcu
@@-$(MKDIRHIER) $(@:d)
$(GNUCOPY) $< $@
diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk
index 1c70204..ba7236d 100644
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk
+++ b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk
@@ -34,18 +34,18 @@ PRJ=..$/..$/..$/..$/..$/..$/..$/..
PRJNAME=sdext
TARGET=data_ooOfficeext
PACKAGE=org.openoffice.Office.extension
-EXTNAME=presenter
+EXTENSIONNAME=PresenterScreen
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/util$/makefile.pmk
XCSROOT=$(PRJ)$/source$/presenter
-ABSXCSROOT=$(PRJ)$/source$/presenter
+ABSXCSROOT=$(PWD)/$(PRJ)$/source$/presenter
# --- Targets ------------------------------------------------------
XCUFILES= \
- PresenterScren.xcu
+ PresenterScreen.xcu
MODULEFILES=
diff --git a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs b/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
index 38a8212..48aad71 100644
--- a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
+++ b/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
@@ -29,7 +29,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************ -->
-<!DOCTYPE oor:component-schema SYSTEM "../../../../component-schema.dtd">
<oor:component-schema xml:lang="en-US" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:package="org.openoffice.Office.extension" oor:name="PresenterScreen">
<info>
<author>AF</author>
diff --git a/swext/mediawiki/help/makefile.mk b/swext/mediawiki/help/makefile.mk
index 25568fd..6281467 100644
--- a/swext/mediawiki/help/makefile.mk
+++ b/swext/mediawiki/help/makefile.mk
@@ -30,7 +30,7 @@
#*************************************************************************
PRJ=..$/..
-PRJNAME=mediawiki
+PRJNAME=swext
TARGET=$(PRJNAME)_help
.INCLUDE : settings.mk
@@ -42,7 +42,7 @@ PACKAGE=com.sun.sun-mediawiki
# workaround for the problem in help, the help uses en instead of en-US
MEDIAWIKI_LANG= en $(alllangiso)
-OUT_MEDIAWIKI=$(MISC)$/$(PRJNAME)
+OUT_MEDIAWIKI=$(MISC)$/mediawiki
OUT_HELP=$(OUT_MEDIAWIKI)$/help
XHPFILES= \
@@ -71,7 +71,7 @@ $(OUT_HELP)$/{$(MEDIAWIKI_LANG)}$/$(PACKAGE)$/%.xhp :| %.xhp
# @$(NULL)
-$(OUT_MEDIAWIKI)$/$(TARGET).done : localize.sdf $(XHPFILES) $(HLANGXHPFILES)
- @$(HELPEX) -QQ -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 localize.sdf && $(TOUCH) $@
+$(OUT_MEDIAWIKI)$/$(TARGET).done : $(LOCALIZESDF) $(XHPFILES) $(HLANGXHPFILES)
+ @$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) helpex -QQ -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
diff --git a/swext/prj/build.lst b/swext/prj/build.lst
index 7dcb129..6b8c4dd 100644
--- a/swext/prj/build.lst
+++ b/swext/prj/build.lst
@@ -1,4 +1,4 @@
-swext swext : javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons officecfg readlicense_oo xsltml filter NULL
+swext swext : l10n javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons officecfg readlicense_oo xsltml filter 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
More information about the ooo-build-commit
mailing list