[Libreoffice-commits] .: Branch 'integration/dev300_m98' - 138 commits - postprocess/packcomponents postprocess/packregistry postprocess/prj postprocess/signing
Michael Meeks
mmeeks at kemper.freedesktop.org
Thu Feb 17 07:20:32 PST 2011
postprocess/packcomponents/makefile.mk | 384 +++++++++++++++++++++++++++++++++
postprocess/packregistry/makefile.mk | 4
postprocess/prj/build.lst | 3
postprocess/prj/d.lst | 4
postprocess/signing/makefile.mk | 8
5 files changed, 396 insertions(+), 7 deletions(-)
New commits:
commit ddf9824d4451ca6012442781bdbf4f52a422b8db
Merge: 99474dc... b77f797...
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Feb 17 15:18:30 2011 +0000
Merge remote branch 'stage/premerge/dev300_m98' into integration/dev300_m98
Conflicts:
postprocess/packregistry/makefile.mk
postprocess/prj/build.lst
diff --cc postprocess/prj/build.lst
index cfef0b3,20de2ed..317002f
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@@ -1,4 -1,4 +1,4 @@@
- po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver NULL
-po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
++po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver LIBXSLT:libxslt NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
commit b77f79765c3ce26c1b659eb6e12db53d2ae76209
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Feb 2 11:08:19 2011 -0600
pre-merge ooo/dev300_m98
Conflicts:
packimages/pack/makefile.mk -> add navigationobjectbar.xml
postprocess/checkdeliver/checkdeliver:
mostlyt change relating to the packaging/delivering of themes.
ooo side add support ofr Oxygen. stuck with the WITH_THEME config instead.
postprocess/checkdeliver/makefile.mk -> mostly tweak due to split git repo
postprocess/packregistry/makefile.mk -> same fix in different ways, kept 'our way'
postprocess/prj/build.lst
!! that one need to be really merged.
kept oo side entirerely
postprocess/rebase/makefile.mk minor build tweak
mostly tab/space conflict, kept our side
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4890e11
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+# backup and temporary files
+*~
+.*.sw[op]
+
+# the build directories
+/*/unxlng??
+/*/unxlng??.pro
+/*/wntmsc???
+/*/wntmsc???.pro
diff --git a/packimages/pack/image-sort.lst b/packimages/pack/image-sort.lst
index d7a615b..5339b55 100644
--- a/packimages/pack/image-sort.lst
+++ b/packimages/pack/image-sort.lst
@@ -309,6 +309,7 @@ uiconfig/modules/swriter/toolbar/graphicobjectbar.xml
uiconfig/modules/swriter/toolbar/insertbar.xml
uiconfig/modules/swriter/toolbar/mediaobjectbar.xml
uiconfig/modules/swriter/toolbar/moreformcontrols.xml
+uiconfig/modules/swriter/toolbar/navigationobjectbar.xml
uiconfig/modules/swriter/toolbar/numobjectbar.xml
uiconfig/modules/swriter/toolbar/oleobjectbar.xml
uiconfig/modules/swriter/toolbar/optimizetablebar.xml
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk
index d31e576..9198aef 100644
--- a/packimages/pack/makefile.mk
+++ b/packimages/pack/makefile.mk
@@ -36,74 +36,33 @@ RSCCUSTOMIMG*=$(PRJ)
IMAGES := $(COMMONBIN)$/images.zip
SORTED_LIST=$(RES)$/img$/sorted.lst
-# Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially
-CUSTOM_IMAGE_SETS=hicontrast industrial crystal oxygen tango classic
+# Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially
+# (Tango fallbacks to Industrial for the missing icons)
+CUSTOM_IMAGE_SETS=$(WITH_THEMES)
CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
-CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
-OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz
-CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
-
ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
$(IMAGES) $(CUSTOM_IMAGES) : $(SORTED_LIST)
$(SORTED_LIST) : image-sort.lst
- +-$(MKDIR) $(RES)$/img
- +$(PERL) $(SOLARENV)$/bin$/image-sort.pl image-sort.lst $(SOLARXMLDIR) $@
+ +-$(MKDIR) $(RES)$/img
+ +$(PERL) $(SOLARENV)$/bin$/image-sort.pl image-sort.lst $(SOLARXMLDIR) $@
$(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST)
- @@-$(MKDIR) $(RES)$/img
+ @@-$(MKDIR) $(RES)$/img
#+-$(RM) $@ $@.$(INPATH)
- $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH)
- $(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@
+ $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH)
+ $(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@
$(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst
- $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
+ $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
images_% : $(RES)$/img$/commandimagelist.ilst
- $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
+ $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
# make sure to have one to keep packing happy
$(COMMONBIN)$/images_brand.zip:
- @$(TOUCH) $@
-
-# generate the HiContrast icon set
-$(MISC)$/hicontrast.flag .PHONY :
- $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(SOLARSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@
-
-# unpack the Crystal icon set
-$(MISC)$/crystal.flag : $(CRYSTAL_TARBALL)
- cd $(MISC) && gzip -d -c $(CRYSTAL_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
-.IF "$(GUI)"=="UNX"
- chmod -R g+w $(MISC)$/crystal
-.ENDIF
- @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed"
-
-# unpack the Oxygen icon set
-$(MISC)$/oxygen.flag : $(OXYGEN_TARBALL)
- cd $(MISC) && gzip -d -c $(OXYGEN_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
-.IF "$(GUI)"=="UNX"
- chmod -R g+w $(MISC)$/oxygen
-.ENDIF
- @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed"
-
-# unpack the classic icon set
-$(MISC)$/classic.flag : $(CLASSIC_TARBALL)
- cd $(MISC) && gunzip -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
-.IF "$(GUI)"=="UNX"
- chmod -R g+w $(MISC)$/classic
-.ENDIF
- @$(TYPE) $@ || echo "ERROR: unpacking $(CLASSIC_TARBALL) failed"
-
-# dependencies
-images_hicontrast : $(MISC)$/hicontrast.flag $(RES)$/img$/commandimagelist.ilst
-
-images_crystal : $(MISC)$/crystal.flag $(RES)$/img$/commandimagelist.ilst
-
-images_oxygen : $(MISC)$/oxygen.flag $(RES)$/img$/commandimagelist.ilst
-
-images_classic : $(MISC)$/classic.flag $(RES)$/img$/commandimagelist.ilst
-
+ @$(TOUCH) $@
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index 140e1be..b68b8ee 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -77,7 +77,7 @@ sub get_globals
# set global variables according to environnment
$platform = $ENV{INPATH};
- $srcrootdir = $ENV{SOURCE_ROOT_DIR};
+ $srcrootdir = "$ENV{SOURCE_ROOT_DIR}/clone";
$solverdir = $ENV{SOLARVERSION};
$milestoneext = $ENV{UPDMINOREXT};
@@ -162,11 +162,10 @@ sub check
print_logged( "Error: cannot open file \'$listname\'\n$!" );
exit 2;
}
- while ( <DELIVERLOG> ) {
+ foreach ( <DELIVERLOG> ) {
next if ( /^LINK / );
# What's this modules' repository?
- if ( /COPY\s+(.+?)\/$module\/prj\/build.lst/ ) {
-# if ( /COPY (\w[\w\s-]*?)\/$module\/prj\/build.lst/ ) {
+ if ( /COPY (\w[\w\s-]*?)\/$module\/prj\/build.lst/ ) {
$repository = $1;
}
# For now we concentrate on binaries, located in 'bin' or 'lib' and 'misc/build/<...>/[bin|lib]'.
diff --git a/postprocess/checkdeliver/makefile.mk b/postprocess/checkdeliver/makefile.mk
index fa5677b..ad6f5c0 100644
--- a/postprocess/checkdeliver/makefile.mk
+++ b/postprocess/checkdeliver/makefile.mk
@@ -38,6 +38,7 @@ TARGET=checkdeliver
ALLTAR : $(MISC)$/checkdeliver.done
$(MISC)$/checkdeliver.done .PHONY:
- @-$(RM) $(MISC)$/checkdeliver_log.txt
- $(PERL) checkdeliver.pl -l $(MISC)$/checkdeliver_log.txt && $(TOUCH) $@
+ # FIXME: the output was always ignored until ooo320-m15; it would be nice to check it though
+ # $(PERL) checkdeliver.pl && $(TOUCH) $@
+ $(TOUCH) $@
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 4109bfd..33c753c 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -326,6 +326,7 @@ MY_FILES_main += $(MY_MOD)/DataAccess/adabas.xcu
.END
.IF "$(ENABLE_EVOAB2)" == "TRUE"
MY_FILES_main += $(MY_MOD)/DataAccess/evoab2.xcu
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
.END
.IF "$(SOLAR_JAVA)" == "TRUE"
MY_FILES_main += \
diff --git a/postprocess/rebase/makefile.mk b/postprocess/rebase/makefile.mk
index 9543866..0ccfa6b 100755
--- a/postprocess/rebase/makefile.mk
+++ b/postprocess/rebase/makefile.mk
@@ -44,16 +44,16 @@ IMAGENAMES=$(SOLARBINDIR)$/*.dll $(SOLARBINDIR)$/so$/*.dll
ALLTAR : REBASE
REBASE .PHONY : $(BASEADDRESSES)
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)$(CPU)"=="WNTI"
.IF "$(product)"=="full"
- $(PERL) rebase.pl -C $(BASEADDRESSES) -b $(STARTADDRESS) -d -e 10000 -l $(LOGFILE) -m $(MISC) -v -R $(SOLARBINDIR) -N $(EXCLUDELIST) $(IMAGENAMES)
+ $(PERL) rebase.pl -C $(BASEADDRESSES) -b $(STARTADDRESS) -d -e 10000 -l $(LOGFILE) -m $(MISC) -v -R $(SOLARBINDIR) -N $(EXCLUDELIST) $(IMAGENAMES)
.ELSE # "$(product)"=="full"
- @echo Doing nothing on non product builds ...
+ @echo Doing nothing on non product builds ...
.ENDIF # "$(product)"=="full"
-.ELSE # "$(GUI)"=="WNT"
- @echo Nothing to do, 'rebase' is windows only.
+.ELSE # "$(GUI)"=="WNTI"
+ @echo We do rebasing on 32-bit Windows only.
.ENDIF
$(BASEADDRESSES) : coffbase.txt
- $(COPY) coffbase.txt $@
+ $(COPY) coffbase.txt $@
commit 378375d776c5c279f4baa64249890d5b767a11a5
Merge: cb8a04a... cb3ac10...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Sat Jan 8 11:26:08 2011 +0100
CWS-TOOLING: integrate CWS ause129
commit cb3ac10c5118a191492ec85a26f589556cae9b28
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Thu Jan 6 12:34:08 2011 +0100
ause129: #i116325# don't process .<basename>.xcu, created on mac
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index a688178..4109bfd 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -522,7 +522,7 @@ $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE :
cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip
- $(RM) $(MISC)/$(@:b).list
echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
- find $(@:b).unzip -name \*.xcu -size +0c -print) \
+ find $(@:b).unzip -name [^.]\*.xcu -size +0c -print) \
'<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
$(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
$(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
@@ -541,7 +541,7 @@ $(MISC)/lang/registry_%.xcd .ERRREMOVE :
unzip $(SOLARPCKDIR)/fcfg_drivers_$*.zip
- $(RM) $(MISC)/$(@:b).list
echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
- find $(@:b).unzip fcfg_drivers_$*.unzip -name \*.xcu -print) \
+ find $(@:b).unzip fcfg_drivers_$*.unzip -name [^.]\*.xcu -print) \
'<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
$(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
$(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
commit cb8a04aa96acccf2c2b201aa2aba9ca58c25b51f
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date: Tue Dec 28 17:59:34 2010 +0100
dr77: post rebase fixes
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 537a62b..3ca8a15 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -109,6 +109,7 @@ my_components = \
log \
mcnttype \
migrationoo2 \
+ msfilter \
msforms \
mysql \
odbc \
commit ca79847e13681f0f7a10349e2976f502ed45e00f
Merge: e157a78... c30401c...
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date: Mon Dec 27 12:33:29 2010 +0100
dr77: rebase to DEV300m96
commit c30401c025bc6b90b748cd3f812704f68ff130e6
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Tue Dec 21 12:44:03 2010 +0100
#i10000# workaround strange out of memory error on mac
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index 05db6f3..140e1be 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -162,7 +162,7 @@ sub check
print_logged( "Error: cannot open file \'$listname\'\n$!" );
exit 2;
}
- foreach ( <DELIVERLOG> ) {
+ while ( <DELIVERLOG> ) {
next if ( /^LINK / );
# What's this modules' repository?
if ( /COPY\s+(.+?)\/$module\/prj\/build.lst/ ) {
commit 8514d6302eb23e860cc5a4fa1ee4ed3e4c8ee923
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Mon Dec 20 18:07:42 2010 +0100
#i10000# reenable checkdeliver
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index f9600fc..20de2ed 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,6 +1,7 @@
po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
+po postprocess\checkdeliver nmake - all po_checkdlv NULL
po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
po postprocess\packregistry nmake - all po_packregistry NULL
po postprocess\packcomponents nmake - all po_packcomponents NULL
commit 6310195de0a03c97da8a17b610c35aa153953080
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Mon Dec 20 16:35:56 2010 +0100
#i10000# create some dependencies...
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index bcb045b..537a62b 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -366,7 +366,7 @@ $(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
$(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
$(SOLARENV)/bin/packcomponents.xslt $(MISC)/services.input
-$(MISC)/services.input :
+$(MISC)/services.input : makefile.mk
echo \
'<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
> $@
commit ec0d602af0bbe28ba0438d8c12778fc0f4d71d16
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Mon Dec 20 13:59:36 2010 +0100
#i10000# add dependency to trigger rebuild
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index df1449f..bcb045b 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -377,7 +377,7 @@ $(MISC)/ooo-services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
$(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
$(SOLARENV)/bin/packcomponents.xslt $(MISC)/ooo-services.input
-$(MISC)/ooo-services.input :
+$(MISC)/ooo-services.input : makefile.mk
echo '<list>' \
'$(my_ooo_components:^"<filename>":+".component</filename>")' \
'</list>' > $@
commit ee873a9b6656e35d61b596564e00c2a8c863bc95
Merge: 8526e83... 34967ac...
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Fri Dec 17 16:18:53 2010 +0100
CWS-TOOLING: integrate CWS sb131
diff --cc postprocess/prj/build.lst
index edbee80,20de2ed..f9600fc
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@@ -1,6 -1,7 +1,6 @@@
- po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
+ po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
-po postprocess\checkdeliver nmake - all po_checkdlv NULL
po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
po postprocess\packregistry nmake - all po_packregistry NULL
po postprocess\packcomponents nmake - all po_packcomponents NULL
commit 8526e8323168ff107bf1cef3c3467b8f0f882cfd
Merge: 0829e64... d72d391...
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Fri Dec 17 12:43:22 2010 +0100
CWS-TOOLING: integrate CWS gnumake2
commit d72d391b9a81925d54d1fb1314c5bd7ee8fc8c42
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date: Thu Dec 9 11:07:26 2010 +0100
gnumake2: removing duplicate msword entry in postprocess/packcomponents caused by resync to DEV300_m95
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 55a4e82..df1449f 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -110,7 +110,6 @@ my_components = \
mcnttype \
migrationoo2 \
msforms \
- msword \
mysql \
odbc \
offacc \
commit 2daf12c7a6c22799ff25f67f53b9885132cad4f5
Merge: 6d17aec... 0829e64...
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date: Wed Dec 8 14:12:49 2010 +0100
gnumake2: resync to DEV300_m95
commit 6d17aecfbe65dc88185b13a10116d4a95995d74c
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date: Sun Dec 5 11:56:12 2010 +0100
gnumake2: fixing msword component file location in postprocess
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index e043fee..df1449f 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -65,6 +65,7 @@ my_components = \
component/svtools/source/hatchwindow/hatchwindowfactory \
component/svtools/source/productregistration/productregistration.uno \
component/svtools/util/svt \
+ component/sw/util/msword \
component/sw/util/sw \
component/sw/util/swd \
component/sw/util/vbaswobj \
@@ -109,7 +110,6 @@ my_components = \
mcnttype \
migrationoo2 \
msforms \
- msword \
mysql \
odbc \
offacc \
commit c5e9d37a2c5653703c5b8e48cb69f1397afb3bdc
Merge: 178a0f9... e78e047...
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date: Fri Dec 3 23:25:58 2010 +0100
gnumake2: merging in os144
commit 0829e64238cffd1b88532a8c26084c80aaa7ca91
Merge: bbece2b... e78e047...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Fri Dec 3 11:31:00 2010 +0100
CWS-TOOLING: integrate CWS os144
commit 178a0f9ffbd873a1713bf9d8890867123dec9ee0
Merge: 9eb6eaa... bbece2b...
Author: Mathias Bauer <mba at openoffice.org>
Date: Fri Nov 26 15:27:38 2010 +0100
CWS gnumake2: resync to m94
commit 34967ac4a0451b9b30d67eb02e6b0a28a946e73e
Merge: 6f0cd39... bbece2b...
Author: sb <sb at openoffice.org>
Date: Fri Nov 19 11:35:41 2010 +0100
sb131: merged in re/DEV300_next towards DEV300_m94
commit e78e04797158bd1148f3f0cfb097bf249153c13c
Author: os <os at openoffice.org>
Date: Thu Nov 18 08:26:12 2010 +0100
#i115608# msword component registration
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 521b69a..4cc5742 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -98,6 +98,7 @@ my_components = \
mcnttype \
migrationoo2 \
msforms \
+ msword \
mysql \
odbc \
offacc \
commit b203e3ebf8bdc6890c391327733e593884837a20
Merge: 3b3c690... bbece2b...
Author: os <os at openoffice.org>
Date: Wed Nov 17 07:23:52 2010 +0100
merged DEV300:m93
commit 9eb6eaadc453f10d5517aec5eac120441f9b5148
Merge: 32ad0c2... c21a4b0...
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date: Sat Nov 13 00:29:13 2010 +0100
gnumake2: merging minibranches
commit c21a4b070311b10cbf6cf52a53ebcc6a15f3628f
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date: Sat Nov 13 00:07:21 2010 +0100
gnumake2: disabling postprocess/checkdeliver as it consistently fails on unxmacxi
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 4ac374f..edbee80 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,7 +1,6 @@
po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
-po postprocess\checkdeliver nmake - all po_checkdlv NULL
po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
po postprocess\packregistry nmake - all po_packregistry NULL
po postprocess\packcomponents nmake - all po_packcomponents NULL
commit 32ad0c24a11058b6948c7f557f94e8ff085b653d
Merge: 55b4cb8... ae2b613...
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date: Wed Nov 10 17:21:00 2010 +0100
gnumake2: mergeing minibranches
commit ae2b6136d3f6919597a67876e1a54d7fc9e995a0
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date: Wed Nov 10 16:02:26 2010 +0100
gnumake2: fixed component file location in outdir
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index b052449..7be6905 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -55,6 +55,22 @@ my_components = \
charttools \
chartview \
comphelp4 \
+ component/framework/util/fwk \
+ component/framework/util/fwl \
+ component/framework/util/fwm \
+ component/sfx2/util/sfx \
+ component/svl/source/fsstor/fsstorage \
+ component/svl/source/passwordcontainer/passwordcontainer \
+ component/svl/util/svl \
+ component/svtools/source/hatchwindow/hatchwindowfactory \
+ component/svtools/source/productregistration/productregistration.uno \
+ component/svtools/util/svt \
+ component/sw/util/sw \
+ component/sw/util/swd \
+ component/sw/util/vbaswobj \
+ component/toolkit/util/tk \
+ component/xmloff/source/transform/xof \
+ component/xmloff/util/xo \
configmgr \
ctl \
date \
@@ -81,12 +97,7 @@ my_components = \
fpicker \
fps_office \
frm \
- svl/source/fsstor/fsstorage \
- framework/util/fwk \
- framework/util/fwl \
- framework/util/fwm \
guesslang \
- svtools/source/hatchwindow/hatchwindowfactory \
hwp \
hyphen \
i18npool \
@@ -104,12 +115,10 @@ my_components = \
oooimprovecore \
oox \
package2 \
- svl/source/passwordcontainer/passwordcontainer \
pcr \
pdffilter \
placeware \
preload \
- svtools/source/productregistration/productregistration.uno \
protocolhandler \
pythonloader \
pythonscript \
@@ -127,7 +136,6 @@ my_components = \
sdbc2 \
sdbt \
sdd \
- sfx2/util/sfx \
simplecanvas \
slideshow \
sm \
@@ -139,16 +147,11 @@ my_components = \
srtrs1 \
stringresource \
svgfilter \
- svl/util/svl \
- svtools/util/svt \
svx \
svxcore \
- sw/util/sw \
- sw/util/swd \
syssh \
t602filter \
textconversiondlgs \
- toolkit/util/tk \
tvhlp1 \
ucb1 \
ucpchelp1 \
@@ -167,7 +170,6 @@ my_components = \
utl \
uui \
vbaobj \
- sw/util/vbaswobj \
vcl \
vclcanvas \
wpft \
@@ -176,8 +178,6 @@ my_components = \
xmlfa \
xmlfd \
xmx \
- xmloff/util/xo \
- xmloff/source/transform/xof \
xsltdlg \
xsltfilter \
xstor
commit e157a78223eb8507f87eb87b67f05bc6cf6eb7e6
Merge: 0ccd721... bbece2b...
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date: Tue Nov 9 15:15:30 2010 +0100
dr77: rebase to DEV300m92
commit 55b4cb8efcd34a7dfb4ce09e108ba8131831635e
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date: Sat Nov 6 15:58:44 2010 +0100
gnumake2: added component registration
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 521b69a..b052449 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -81,12 +81,12 @@ my_components = \
fpicker \
fps_office \
frm \
- fsstorage \
- fwk \
- fwl \
- fwm \
+ svl/source/fsstor/fsstorage \
+ framework/util/fwk \
+ framework/util/fwl \
+ framework/util/fwm \
guesslang \
- hatchwindowfactory \
+ svtools/source/hatchwindow/hatchwindowfactory \
hwp \
hyphen \
i18npool \
@@ -104,12 +104,12 @@ my_components = \
oooimprovecore \
oox \
package2 \
- passwordcontainer \
+ svl/source/passwordcontainer/passwordcontainer \
pcr \
pdffilter \
placeware \
preload \
- productregistration.uno \
+ svtools/source/productregistration/productregistration.uno \
protocolhandler \
pythonloader \
pythonscript \
@@ -127,7 +127,7 @@ my_components = \
sdbc2 \
sdbt \
sdd \
- sfx \
+ sfx2/util/sfx \
simplecanvas \
slideshow \
sm \
@@ -139,16 +139,16 @@ my_components = \
srtrs1 \
stringresource \
svgfilter \
- svl \
- svt \
+ svl/util/svl \
+ svtools/util/svt \
svx \
svxcore \
- sw \
- swd \
+ sw/util/sw \
+ sw/util/swd \
syssh \
t602filter \
textconversiondlgs \
- tk \
+ toolkit/util/tk \
tvhlp1 \
ucb1 \
ucpchelp1 \
@@ -167,7 +167,7 @@ my_components = \
utl \
uui \
vbaobj \
- vbaswobj \
+ sw/util/vbaswobj \
vcl \
vclcanvas \
wpft \
@@ -176,8 +176,8 @@ my_components = \
xmlfa \
xmlfd \
xmx \
- xo \
- xof \
+ xmloff/util/xo \
+ xmloff/source/transform/xof \
xsltdlg \
xsltfilter \
xstor
commit bbece2b65f8fbac841d2eb1b9f49650ba95b3042
Merge: 3b3c690... 904d490...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Mon Nov 1 15:58:31 2010 +0100
#i10000# changes from OOO330 m13
commit 5e2a4d030eeb1bfc58fab85aa2a1720ce3bd4d20
Merge: 24dc39d... 3b3c690...
Author: Mathias Bauer <mba at openoffice.org>
Date: Thu Oct 28 23:02:10 2010 +0200
CWS gnumake: resync to m91; conflicts unresolved
commit 904d490da093972a8dd6328270529b536816a85f
Author: Ruediger Timm <rt at openoffice.org>
Date: Thu Oct 28 17:11:15 2010 +0200
masterfix OOO330: #i10000# Update list of default base addresses for windows rebase process.
diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index 9098ab2..16be853 100755
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -47,7 +47,7 @@ cli_uno.dll 0x0000000065c20000 0x00030000
collator_data.dll 0x0000000065aa0000 0x00170000
communimi.dll 0x0000000065a80000 0x00010000
comphelp4msc.dll 0x0000000065980000 0x000f0000
-configmgr2.uno.dll 0x0000000065800000 0x00170000
+configmgr.uno.dll 0x000000005adb0000 0x00070000
connector.uno.dll 0x00000000657e0000 0x00010000
cppcanvasmi.dll 0x0000000065780000 0x00050000
cppu3.dll 0x0000000065740000 0x00030000
@@ -126,11 +126,11 @@ i18nsearch.uno.dll 0x0000000063570000 0x00010000
i18nutilmsc.dll 0x0000000063540000 0x00020000
icdmi.dll 0x0000000063520000 0x00010000
icgmi.dll 0x00000000634f0000 0x00020000
-icudt36l.dll 0x0000000062b00000 0x009c0000
-icuin36.dll 0x0000000062a20000 0x000d0000
-icule36.dll 0x00000000629d0000 0x00040000
-icutu36.dll 0x00000000629a0000 0x00020000
-icuuc36.dll 0x00000000628b0000 0x000e0000
+icudt40.dll 0x0000000059bb0000 0x00d50000
+icuin40.dll 0x0000000059a90000 0x00110000
+icule40.dll 0x0000000059a40000 0x00040000
+icutu40.dll 0x0000000059a10000 0x00020000
+icuuc40.dll 0x0000000059910000 0x000f0000
idxmi.dll 0x0000000062880000 0x00020000
imemi.dll 0x0000000062860000 0x00010000
index_data.dll 0x00000000627c0000 0x00090000
@@ -180,8 +180,8 @@ localedata_others.dll 0x0000000061aa0000 0x000b0000
logmi.dll 0x0000000061a70000 0x00020000
lpsolve55.dll 0x0000000061970000 0x00070000
mcnttype.dll 0x0000000061950000 0x00010000
-mozab2.dll 0x0000000061900000 0x00020000
-mozabdrv2.dll 0x0000000061880000 0x00070000
+mozabmi.dll 0x00000000597a0000 0x00020000
+mozabdrvmi.dll 0x00000000597d0000 0x00070000
msci_uno.dll 0x0000000061860000 0x00010000
mysql2.dll 0x0000000061820000 0x00030000
namingservice.uno.dll 0x0000000061800000 0x00010000
@@ -348,3 +348,55 @@ npsoplugin.dll 0x000000005b0b0000 0x00010000
migrationoo2.uno.dll 0x000000005b080000 0x00020000
inprocserv.dll 0x000000005b060000 0x00010000
lngmi.dll 0x000000005af50000 0x00100000
+adomi.dll 0x000000005aea0000 0x00080000
+cppunit_dll.dll 0x000000005ad60000 0x00040000
+drawinglayermi.dll 0x000000005ac00000 0x00100000
+editengmi.dll 0x000000005aa80000 0x00170000
+formi.dll 0x000000005aa30000 0x00020000
+foruimi.dll 0x000000005a9f0000 0x00030000
+freebl3.dll 0x000000005a9a0000 0x00040000
+hsqldb.dll 0x000000005a950000 0x00040000
+i18npapermi.dll 0x000000005a930000 0x00010000
+jdbcmi.dll 0x00000000598b0000 0x00050000
+jpipx.dll 0x0000000059890000 0x00010000
+log_uno_uno.dll 0x0000000059870000 0x00010000
+migrationoo3.uno.dll 0x0000000059850000 0x00010000
+msfiltermi.dll 0x00000000596e0000 0x000b0000
+msformsmi.uno.dll 0x0000000059680000 0x00050000
+mswordmi.dll 0x0000000059560000 0x00110000
+mysqlcppconn.dll 0x00000000594c0000 0x00090000
+mysqlmi.dll 0x0000000059480000 0x00030000
+neon.dll 0x0000000059450000 0x00020000
+nspr4.dll 0x0000000059410000 0x00030000
+nss3.dll 0x0000000059330000 0x000d0000
+nssckbi.dll 0x00000000592c0000 0x00060000
+nssdbm3.dll 0x0000000059290000 0x00020000
+nssutil3.dll 0x0000000059260000 0x00020000
+odbcbasemi.dll 0x00000000591f0000 0x00060000
+odbcmi.dll 0x00000000591d0000 0x00010000
+ooofilt_x64.dll 0x0000000059130000 0x00090000
+oooimprovementmi.dll 0x0000000059100000 0x00020000
+plc4.dll 0x00000000590e0000 0x00010000
+plds4.dll 0x00000000590c0000 0x00010000
+propertyhdl.dll 0x0000000059070000 0x00040000
+propertyhdl_x64.dll 0x0000000058fe0000 0x00080000
+python26.dll 0x0000000058da0000 0x00230000
+rebase.dll 0x0000000058d50000 0x00040000
+reg64msi.dll 0x0000000058cc0000 0x00030000
+scfiltmi.dll 0x0000000058aa0000 0x001c0000
+sdfiltmi.dll 0x0000000058a20000 0x00070000
+shlxthdl_x64.dll 0x0000000058940000 0x000d0000
+smime3.dll 0x0000000058910000 0x00020000
+so_activex_x64.dll 0x00000000588c0000 0x00040000
+softokn3.dll 0x0000000058880000 0x00030000
+sqlite3.dll 0x00000000587c0000 0x00070000
+ssl3.dll 0x0000000058780000 0x00030000
+svxcoremi.dll 0x0000000058230000 0x00540000
+test.dll 0x0000000058120000 0x00010000
+test_converter.dll 0x0000000058100000 0x00010000
+ucpext.uno.dll 0x00000000580d0000 0x00020000
+ucpmyucp1.uno.dll 0x00000000580a0000 0x00020000
+vbaeventsmi.uno.dll 0x0000000058070000 0x00020000
+vbahelpermi.dll 0x0000000057fc0000 0x000a0000
+vbaswobjmi.uno.dll 0x0000000057ef0000 0x000c0000
+wpftmi.dll 0x0000000057e50000 0x00060000
commit 6f0cd39e487ed730ae7620372cd08e0ddbae4e2b
Author: sb <sb at openoffice.org>
Date: Fri Oct 22 10:37:46 2010 +0200
sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 4ac374f..20de2ed 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
+po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
commit 802e6eb8dda2e9b43f75130bcc34622bd6258338
Merge: 0c5b6e6... fdb6cd6...
Author: sb <sb at openoffice.org>
Date: Thu Oct 21 16:44:33 2010 +0200
sb131: merged in DEV300_m90
commit 3b3c690170a35937f99d710386554a6399bb7f6b
Merge: efa3786... fdb6cd6...
Author: Mathias Bauer <mba at openoffice.org>
Date: Thu Oct 21 15:10:42 2010 +0200
CWS changehid: resync to m90
commit fdb6cd69d8c4747b71dc860de0e1b7a11d23c9bc
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Mon Oct 18 14:46:06 2010 +0200
#i114970#
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 8763026..521b69a 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -203,7 +203,7 @@ my_components += gconfbe1
.END
.IF "$(ENABLE_GIO)" != ""
-my_components += ucpgio1
+my_components += ucpgio
.END
.IF "$(ENABLE_GNOMEVFS)" != ""
commit efa3786b0a603ef964df28a066a88eee704925bd
Merge: 5a7889d... bbf6f1f...
Author: Mathias Bauer <mba at openoffice.org>
Date: Sat Oct 9 18:56:58 2010 +0200
CWS changehid: resync to m89
commit bbf6f1fd0dacaf58eee92925423d10399bf0994e
Merge: 572fea4... a3da16f...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Fri Oct 1 16:02:03 2010 +0200
#i10000#
commit a3da16f5ebf12e1c68f07c860c8d45c836710d02
Merge: 572fea4... 0c5b6e6...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Wed Sep 29 10:24:13 2010 +0200
CWS-TOOLING: integrate CWS sb129
commit 0ccd721c35440aa34661b53a3c2cf6190ff76e84
Merge: ffafb54... 572fea4...
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date: Tue Sep 28 20:30:05 2010 +0200
dr77: rebase to DEV300_m88
commit 0c5b6e6080556a9f3b4c3e0ff09257647cbe2538
Merge: 0ce7475... 572fea4...
Author: sb <sb at openoffice.org>
Date: Wed Sep 22 10:27:02 2010 +0200
sb129: merged in DEV300_m88
commit 572fea450b62454c4ed544631182fc3071667448
Author: Release Engineering <releng at openoffice.org>
Date: Mon Sep 20 18:22:00 2010 +0200
DEV300 masterfix: #i10000#: wrong regexp
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index 3b07f78..05db6f3 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -165,7 +165,8 @@ sub check
foreach ( <DELIVERLOG> ) {
next if ( /^LINK / );
# What's this modules' repository?
- if ( /COPY (\w[\w\s-]*?)\/$module\/prj\/build.lst/ ) {
+ if ( /COPY\s+(.+?)\/$module\/prj\/build.lst/ ) {
+# if ( /COPY (\w[\w\s-]*?)\/$module\/prj\/build.lst/ ) {
$repository = $1;
}
# For now we concentrate on binaries, located in 'bin' or 'lib' and 'misc/build/<...>/[bin|lib]'.
commit 0ce74759e817d972a3774c3fed273ce389768ba5
Author: sb <sb at openoffice.org>
Date: Wed Sep 15 11:45:04 2010 +0200
sb129: #i113189# cleaned up makefile rules; deliver services.input to have it modifiable for special one-off products
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 6f02d10..8763026 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -365,8 +365,7 @@ $(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
$(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
$(SOLARENV)/bin/packcomponents.xslt $(MISC)/services.input
-$(MISC)/services.input .ERRREMOVE :
- - $(RM) $@
+$(MISC)/services.input :
echo \
'<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
> $@
@@ -377,8 +376,7 @@ $(MISC)/ooo-services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
$(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
$(SOLARENV)/bin/packcomponents.xslt $(MISC)/ooo-services.input
-$(MISC)/ooo-services.input .ERRREMOVE :
- - $(RM) $@
+$(MISC)/ooo-services.input :
echo '<list>' \
'$(my_ooo_components:^"<filename>":+".component</filename>")' \
'</list>' > $@
diff --git a/postprocess/prj/d.lst b/postprocess/prj/d.lst
index 28c0a7e..9bfe12b 100644
--- a/postprocess/prj/d.lst
+++ b/postprocess/prj/d.lst
@@ -3,4 +3,5 @@ mkdir: %_DEST%\xml%_EXT%\ooo
..\%__SRC%\misc\*.xcd %_DEST%\xml%_EXT%\
..\%__SRC%\misc\lang\*.xcd %_DEST%\xml%_EXT%\
..\%__SRC%\misc\ooo-services.rdb %_DEST%\xml%_EXT%\ooo\services.rdb
+..\%__SRC%\misc\services.input %_DEST%\xml%_EXT%\services.input
..\%__SRC%\misc\services.rdb %_DEST%\xml%_EXT%\services.rdb
commit 7b122ae73e2b3780b29d15a5037a231586cadc46
Author: sb <sb at openoffice.org>
Date: Tue Sep 14 17:10:47 2010 +0200
sb129: #i113189# move mailmerge to brand specific services.rdb
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index ab3797c..6f02d10 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -354,11 +354,11 @@ my_components += avmediagst
my_components += avmedia.jar
.END
-my_components += mailmerge #TODO: OOo mailmerge vs. OOO email
+my_ooo_components = mailmerge
.INCLUDE: target.mk
-ALLTAR : $(MISC)/services.rdb
+ALLTAR : $(MISC)/services.rdb $(MISC)/ooo-services.rdb
$(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
$(MISC)/services.input $(my_components:^"$(SOLARXMLDIR)/":+".component")
@@ -370,3 +370,15 @@ $(MISC)/services.input .ERRREMOVE :
echo \
'<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
> $@
+
+$(MISC)/ooo-services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
+ $(MISC)/ooo-services.input \
+ $(my_ooo_components:^"$(SOLARXMLDIR)/":+".component")
+ $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
+ $(SOLARENV)/bin/packcomponents.xslt $(MISC)/ooo-services.input
+
+$(MISC)/ooo-services.input .ERRREMOVE :
+ - $(RM) $@
+ echo '<list>' \
+ '$(my_ooo_components:^"<filename>":+".component</filename>")' \
+ '</list>' > $@
diff --git a/postprocess/prj/d.lst b/postprocess/prj/d.lst
index 27f2b9c..28c0a7e 100644
--- a/postprocess/prj/d.lst
+++ b/postprocess/prj/d.lst
@@ -1,4 +1,6 @@
+mkdir: %_DEST%\xml%_EXT%\ooo
..\%__SRC%\bin\uiconfig.zip %_DEST%\bin%_EXT%\uiconfig.zip
..\%__SRC%\misc\*.xcd %_DEST%\xml%_EXT%\
..\%__SRC%\misc\lang\*.xcd %_DEST%\xml%_EXT%\
+..\%__SRC%\misc\ooo-services.rdb %_DEST%\xml%_EXT%\ooo\services.rdb
..\%__SRC%\misc\services.rdb %_DEST%\xml%_EXT%\services.rdb
commit 7d30abd55b467afecd40cd4d7b818c10ef3dd21a
Author: sb <sb at openoffice.org>
Date: Fri Sep 10 16:47:14 2010 +0200
sb123: #i113189# brand-specific services.rdb
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index fa6dbe0..ab3797c 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -355,11 +355,6 @@ my_components += avmedia.jar
.END
my_components += mailmerge #TODO: OOo mailmerge vs. OOO email
-#TODO: OOO i18n
-#TODO: OOO migrationoo3
-#TODO: OOO printcompat
-#TODO: OOO socomp
-#TODO: OOO tab2
.INCLUDE: target.mk
commit 185ec3267050a3e8611b9f303ab4f99108dde328
Author: sb <sb at openoffice.org>
Date: Fri Sep 10 14:59:09 2010 +0200
sb123: #i113189# support for --disable-binfilter
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 2360244..fa6dbe0 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -46,9 +46,7 @@ my_components = \
avmedia \
basctl \
basprov \
- bf_migratefilter \
bib \
- bindet \
cached1 \
calc \
canvasfactory \
@@ -258,6 +256,12 @@ my_components += \
web
.END
+.IF "$(WITH_BINFILTER)" != "NO"
+my_components += \
+ bf_migratefilter \
+ bindet
+.END
+
.IF "$(WITH_LDAP)" == "YES"
my_components += ldapbe2
.END
commit 918f7fe32a5625ae81af1ac4be0fc65153681334
Author: sb <sb at openoffice.org>
Date: Fri Sep 10 13:10:07 2010 +0200
sb129: #i113189# change UNO components to use passive registration
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
new file mode 100644
index 0000000..2360244
--- /dev/null
+++ b/postprocess/packcomponents/makefile.mk
@@ -0,0 +1,373 @@
+#*************************************************************************
+#
+# 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.
+#
+#***********************************************************************/
+
+PRJ = ..
+PRJNAME = postprocess
+TARGET = packcomponents
+
+.INCLUDE: settings.mk
+
+#TODO (copied from scp2/source/ooo/makefile.mk):
+.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(ENABLE_GTK)" != ""
+PKGCONFIG_MODULES=gtk+-2.0
+.INCLUDE: pkg_config.mk
+GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
+.END
+
+my_components = \
+ abp \
+ adabasui \
+ analysis \
+ animcore \
+ avmedia \
+ basctl \
+ basprov \
+ bf_migratefilter \
+ bib \
+ bindet \
+ cached1 \
+ calc \
+ canvasfactory \
+ chartcontroller \
+ chartmodel \
+ charttools \
+ chartview \
+ comphelp4 \
+ configmgr \
+ ctl \
+ date \
+ dba \
+ dbacfg \
+ dbase \
+ dbaxml \
+ dbmm \
+ dbp \
+ dbpool2 \
+ dbtools \
+ dbu \
+ deployment \
+ deploymentgui \
+ dlgprov \
+ embobj \
+ evtatt \
+ fastsax \
+ fileacc \
+ filterconfig1 \
+ flash \
+ flat \
+ for \
+ fpicker \
+ fps_office \
+ frm \
+ fsstorage \
+ fwk \
+ fwl \
+ fwm \
+ guesslang \
+ hatchwindowfactory \
+ hwp \
+ hyphen \
+ i18npool \
+ i18nsearch \
+ lng \
+ lnth \
+ localebe1 \
+ log \
+ mcnttype \
+ migrationoo2 \
+ msforms \
+ mysql \
+ odbc \
+ offacc \
+ oooimprovecore \
+ oox \
+ package2 \
+ passwordcontainer \
+ pcr \
+ pdffilter \
+ placeware \
+ preload \
+ productregistration.uno \
+ protocolhandler \
+ pythonloader \
+ pythonscript \
+ res \
+ rpt \
+ rptui \
+ rptxml \
+ sax \
+ sb \
+ sc \
+ scd \
+ scn \
+ scriptframe \
+ sd \
+ sdbc2 \
+ sdbt \
+ sdd \
+ sfx \
+ simplecanvas \
+ slideshow \
+ sm \
+ smd \
+ solver \
+ sot \
+ spell \
+ spl \
+ srtrs1 \
+ stringresource \
+ svgfilter \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ sw \
+ swd \
+ syssh \
+ t602filter \
+ textconversiondlgs \
+ tk \
+ tvhlp1 \
+ ucb1 \
+ ucpchelp1 \
+ ucpexpand1 \
+ ucpext \
+ ucpfile1 \
+ ucpftp1 \
+ ucphier1 \
+ ucppkg1 \
+ ucptdoc1 \
+ unordf \
+ unoxml \
+ updatefeed \
+ updchk \
+ updchk.uno \
+ utl \
+ uui \
+ vbaobj \
+ vbaswobj \
+ vcl \
+ vclcanvas \
+ wpft \
+ writerfilter \
+ xcr \
+ xmlfa \
+ xmlfd \
+ xmx \
+ xo \
+ xof \
+ xsltdlg \
+ xsltfilter \
+ xstor
+
+.IF "$(BUILD_SPECIAL)" != ""
+my_components += oooimprovement
+.END
+
+.IF "$(DISABLE_ATL)" == ""
+my_components += emboleobj
+.END
+
+.IF "$(DISABLE_NEON)" != "TRUE"
+my_components += ucpdav1
+.END
+
+.IF "$(ENABLE_CAIRO)" == "TRUE"
+my_components += cairocanvas
+.END
+
+.IF "$(ENABLE_GCONF)" != ""
+my_components += gconfbe1
+.END
+
+.IF "$(ENABLE_GIO)" != ""
+my_components += ucpgio1
+.END
+
+.IF "$(ENABLE_GNOMEVFS)" != ""
+my_components += ucpgvfs
+.END
+
+.IF "$(ENABLE_KAB)" != ""
+my_components += kab1
+.END
+
+.IF "$(ENABLE_KDE)" != ""
+my_components += kdebe1
+.END
+
+.IF "$(ENABLE_KDE4)" != ""
+my_components += kde4be1
+.END
+
+.IF "$(ENABLE_OGL)" == "TRUE"
+my_components += ogltrans
+.END
+
+.IF "$(ENABLE_SVCTAGS)" == "YES"
+my_components += productregistration.jar
+.END
+
+.IF "$(ENABLE_VBA)" == "YES"
+my_components += vbaevents
+.END
+
+.IF "$(SOLAR_JAVA)" == "TRUE"
+my_components += \
+ LuceneHelpWrapper \
+ ScriptFramework \
+ ScriptProviderForBeanShell \
+ ScriptProviderForJava \
+ ScriptProviderForJavaScript \
+ XMergeBridge \
+ XSLTFilter.jar \
+ XSLTValidate \
+ agenda \
+ fax \
+ form \
+ hsqldb \
+ jdbc \
+ letter \
+ query \
+ report \
+ table \
+ web
+.END
+
+.IF "$(WITH_LDAP)" == "YES"
+my_components += ldapbe2
+.END
+
+.IF "$(WITH_MOZILLA)" != "NO"
+my_components += \
+ xmlsecurity \
+ xsec_fw \
+ xsec_xmlsec \
+ pl
+.END
+
+.IF "$(OS)" == "MACOSX"
+my_components += \
+ MacOSXSpell \
+ avmediaQuickTime \
+ fps_aqua \
+ macab1 \
+ macbe1
+.END
+
+.IF "$(OS)" == "WNT"
+my_components += \
+ ado \
+ dnd \
+ dtrans \
+ fop \
+ fps \
+ ftransl \
+ java_uno_accessbridge \
+ smplmail \
+ sysdtrans \
+ wininetbe1
+.END
+
+.IF "$(OS)" == "WNT" && "$(DISABLE_ATL)" == ""
+my_components += \
+ emser \
+ oleautobridge
+.END
+
+.IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != ""
+my_components += \
+ avmediawin \
+ directx9canvas \
+ gdipluscanvas
+.END
+
+.IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != "" && "$(USE_DIRECTX5)" != ""
+my_components += directx5canvas
+.END
+
+.IF "$(OS)" == "LINUX" || "$(OS)" == "NETBSD" || \
+ ("$(OS)" == "SOLARIS" && "$(CPU)" == "S") || "$(OS)" == "WNT"
+my_components += adabas
+.END
+
+.IF "$(OS)" != "MACOSX" && "$(SYSTEM_MOZILLA)" != "YES" && \
+ "$(WITH_MOZILLA)" != "NO"
+my_components += mozab
+.ELSE
+my_components += mozbootstrap
+.END
+
+.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT"
+my_components += desktopbe1
+.END
+
+.IF "$(GTK_TWO_FOUR)" != ""
+my_components += fps_gnome
+.END
+
+.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(ENABLE_KDE4)" != ""
+my_components += fps_kde4
+.END
+
+.IF "$(OS)" != "WNT"
+my_components += cmdmail
+.END
+
+.IF "$(OS)" != "WNT" && "$(ENABLE_EVOAB2)" != ""
+my_components += evoab
+.END
+
+.IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != ""
+my_components += avmediagst
+.END
+
+.IF "$(OS)" != "WNT" && "$(SOLAR_JAVA)" == "TRUE"
+my_components += avmedia.jar
+.END
+
+my_components += mailmerge #TODO: OOo mailmerge vs. OOO email
+#TODO: OOO i18n
+#TODO: OOO migrationoo3
+#TODO: OOO printcompat
+#TODO: OOO socomp
+#TODO: OOO tab2
+
+.INCLUDE: target.mk
+
+ALLTAR : $(MISC)/services.rdb
+
+$(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
+ $(MISC)/services.input $(my_components:^"$(SOLARXMLDIR)/":+".component")
+ $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
+ $(SOLARENV)/bin/packcomponents.xslt $(MISC)/services.input
+
+$(MISC)/services.input .ERRREMOVE :
+ - $(RM) $@
+ echo \
+ '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
+ > $@
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index c40d984..4ac374f 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -4,5 +4,6 @@ po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
po postprocess\packregistry nmake - all po_packregistry NULL
+po postprocess\packcomponents nmake - all po_packcomponents NULL
po postprocess\rebase nmake - w po_rebase NULL
po postprocess\signing nmake - w,sign po_signing po_rebase.w NULL
diff --git a/postprocess/prj/d.lst b/postprocess/prj/d.lst
index fd8a49d..27f2b9c 100644
--- a/postprocess/prj/d.lst
+++ b/postprocess/prj/d.lst
@@ -1,3 +1,4 @@
..\%__SRC%\bin\uiconfig.zip %_DEST%\bin%_EXT%\uiconfig.zip
..\%__SRC%\misc\*.xcd %_DEST%\xml%_EXT%\
..\%__SRC%\misc\lang\*.xcd %_DEST%\xml%_EXT%\
+..\%__SRC%\misc\services.rdb %_DEST%\xml%_EXT%\services.rdb
commit ffafb548c76cd15d026caa1e151d2037edf28bd5
Merge: 635506b... 635784c...
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date: Mon Aug 30 19:25:43 2010 +0200
dr77: rebase to DEV300m87
commit 635784cd104f8f1c21d03a18fb6e24875861dbf4
Merge: c14ee68... 7a98948...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Wed Aug 25 17:13:00 2010 +0200
CWS-TOOLING: integrate CWS cmcfixes77
commit c14ee68b1bf3666c5b8517ad8de4f3ac38738213
Merge: 635506b... 9292b2c...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Wed Aug 25 16:13:14 2010 +0200
DEV300: changesets OOO330 up to m5
commit 9292b2c5fbd937578c577148e1316e6527d9a2c6
Merge: 635506b... bf82d55...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Aug 3 16:18:31 2010 +0200
CWS-TOOLING: integrate CWS ooo330l10n
commit bf82d55ee3f0eb32b1c43a22956d7281c25131e8
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Mon Jul 26 12:47:06 2010 +0200
ooo330l10n: #i113424# pootle l10n update for ooo330
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 002cea5..f131980 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -469,9 +469,9 @@ MY_FILES_ogltrans = \
.END
.IF "$(GUIBASE)" == "WIN"
-MY_XCDS += $(MISC)/forcedefaultlanguage.xcd
-MY_DEPS_forcedefaultlanguage = main
-MY_FILES_forcedefaultlanguage = \
+MY_XCDS += $(MISC)/forcedefault.xcd
+MY_DEPS_forcedefault = main
+MY_FILES_forcedefault = \
$(MY_MOD)/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu
.END
commit 7a989486fabea84354b2d9c4c74aea442606691b
Author: Caol?n McNamara <cmc at openoffice.org>
Date: Fri Jul 16 14:44:32 2010 +0100
cmcfixes77: #i80021# system libtextcat
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 48af6d1..35b608f 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -343,10 +343,10 @@ MY_FILES_main += $(MY_MOD)/DataAccess/mozab.xcu
MY_FILES_main += $(MY_MOD)/DataAccess/mozab2.xcu
.END
.END
-.IF "$(SYSTEM_LIBTEXTCAT)" != "YES"
-MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-internallibtextcat.xcu
+.IF "$(SYSTEM_LIBTEXTCAT_DATA)" != ""
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-externallibtextcatdata.xcu
.ELSE
-MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-externallibtextcat.xcu
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-internallibtextcatdata.xcu
.END
MY_DEPS_math = main
commit 2b09b61a526b7fbc6a169f04feb31bca76a66775
Author: Caol?n McNamara <cmc at openoffice.org>
Date: Fri Jul 16 08:47:44 2010 +0100
cmcfixes77: #i80021# system libtextcat
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 002cea5..48af6d1 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -343,6 +343,11 @@ MY_FILES_main += $(MY_MOD)/DataAccess/mozab.xcu
MY_FILES_main += $(MY_MOD)/DataAccess/mozab2.xcu
.END
.END
+.IF "$(SYSTEM_LIBTEXTCAT)" != "YES"
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-internallibtextcat.xcu
+.ELSE
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-externallibtextcat.xcu
+.END
MY_DEPS_math = main
MY_FILES_math = \
commit 5a7889d02de3317484299d30b80b55daef3fe378
Merge: 42abe7b... 635506b...
Author: Mathias Bauer <mba at openoffice.org>
Date: Tue Jul 13 14:38:37 2010 +0200
CWS changehid: resync to m84
commit 24dc39d5e211b3b8798aa60d90f90e55a05174c6
Merge: e284749... 635506b...
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date: Tue Jul 13 14:36:24 2010 +0200
CWS gnumake2: resync to DEV300_m84
commit 635506b60afe009654b62ff0fea5d83dafa4596e
Author: Ruediger Timm <rt at openoffice.org>
Date: Mon Jun 28 10:59:58 2010 +0200
masterfix: #i112738# Allow more characters in repository name (inspired by a patch submitted by dtardon).
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index a4b8774..3b07f78 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -165,7 +165,7 @@ sub check
foreach ( <DELIVERLOG> ) {
next if ( /^LINK / );
# What's this modules' repository?
- if ( / (\w+?)\/$module\/prj\/build.lst/ ) {
+ if ( /COPY (\w[\w\s-]*?)\/$module\/prj\/build.lst/ ) {
$repository = $1;
}
# For now we concentrate on binaries, located in 'bin' or 'lib' and 'misc/build/<...>/[bin|lib]'.
commit 0edd7a062a101266f12bab6525cc98ee51276644
Author: Ruediger Timm <rt at openoffice.org>
Date: Wed Jun 23 15:26:20 2010 +0200
masterfix: #i10000# Avoid false alarms in checkdeliver
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index 0505cee..a4b8774 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -52,6 +52,7 @@ my @exceptionmodlist = (
"postprocess",
"instset.*native",
"smoketest.*native",
+ "testautomation",
"testgraphical"
); # modules not yet delivered
@@ -151,6 +152,11 @@ sub check
return 1;
}
+ if ( -z $listname ) {
+ print_logged( "Warning: empty deliver log file \'$listname\'. Module '$module' not delivered correctly?\n\n" );
+ return 0;
+ }
+
# read deliver log file
if ( ! open( DELIVERLOG, "< $listname" ) ) {
print_logged( "Error: cannot open file \'$listname\'\n$!" );
@@ -177,7 +183,7 @@ sub check
close( DELIVERLOG );
if ( ! $repository ) {
- print_logged( "Error parsing \'$listname\': cannot determine repository\n");
+ print_logged( "Error parsing \'$listname\': cannot determine repository. Module '$module' not delivered correctly?\n\n" );
$error ++;
return $error;
}
commit cb91c86d917e88924eff38d93aa59071c76034c3
Merge: 8818c61... 8450493...
Author: obo <obo at openoffice.org>
Date: Tue Jun 15 11:39:58 2010 +0200
CWS-TOOLING: integrate CWS rt39
commit 8818c61c405e57126f97305a5eb85e0f827d8263
Merge: 6f87457... 3836274...
Author: obo <obo at openoffice.org>
Date: Tue Jun 15 10:58:34 2010 +0200
CWS-TOOLING: integrate CWS unoawt
commit 6f874571851ac2efbd38522cd0ab8414f0b37d8e
Merge: 3b316b9... a47e83e...
Author: obo <obo at openoffice.org>
Date: Tue Jun 15 10:26:12 2010 +0200
CWS-TOOLING: integrate CWS fwk139
commit 845049332989b2f5f1d38143a3a0c49236664f19
Author: Ruediger Timm <rt at openoffice.org>
Date: Fri Jun 11 20:15:00 2010 +0200
rt39: #i112287# Include the repository name in deliver.log file.
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index c59464c..0505cee 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -38,7 +38,6 @@ use File::stat;
use IO::Handle;
use lib ("$ENV{SOLARENV}/bin/modules");
-use SourceConfig;
#### globals #####
@@ -49,7 +48,6 @@ my $platform = '';
my $logfile = '';
my $milestoneext = '';
my $local_env = 0;
-my $source_config = SourceConfig -> new($ENV{SOLARSRC});
my @exceptionmodlist = (
"postprocess",
"instset.*native",
@@ -143,6 +141,7 @@ sub check
my $error = 0;
my %delivered;
my $module;
+ my $repository;
STDOUT->autoflush(1);
# which module are we checking?
if ( $listname =~ /\/([\w-]+?)\/deliver\.log$/o) {
@@ -151,9 +150,39 @@ sub check
print_logged( "Error: cannot determine module name from \'$listname\'\n" );
return 1;
}
- # where do we have to look for modules?
- my $repository = $source_config->get_module_repository($module);
- my $path = $source_config->get_module_path($module);
+
+ # read deliver log file
+ if ( ! open( DELIVERLOG, "< $listname" ) ) {
+ print_logged( "Error: cannot open file \'$listname\'\n$!" );
+ exit 2;
+ }
+ foreach ( <DELIVERLOG> ) {
+ next if ( /^LINK / );
+ # What's this modules' repository?
+ if ( / (\w+?)\/$module\/prj\/build.lst/ ) {
+ $repository = $1;
+ }
+ # For now we concentrate on binaries, located in 'bin' or 'lib' and 'misc/build/<...>/[bin|lib]'.
+ next if ( (! /\/$module\/$platform\/[bl]i[nb]\//) && (! /\/$module\/$platform\/misc\/build\//));
+ next if (! /[bl]i[nb]/);
+ next if ( /\.html$/ );
+ chomp;
+ if ( /^\w+? (\S+) (\S+)\s*$/o ) {
+ my $origin = $1;
+ $delivered{$origin} = $2;
+ } else {
+ print_logged( "Warning: cannot parse \'$listname\' line\n\'$_\'\n" );
+ }
+ }
+ close( DELIVERLOG );
+
+ if ( ! $repository ) {
+ print_logged( "Error parsing \'$listname\': cannot determine repository\n");
+ $error ++;
+ return $error;
+ }
+
+ my $path = "$srcrootdir/$repository/$module";
# is module physically accessible?
# there are valid use cases where we build against a prebuild solver whithout having
# all modules at disk
@@ -176,30 +205,10 @@ sub check
return $error;
}
- # read deliver log file
- if ( ! open( DELIVERLOG, "< $listname" ) ) {
- print_logged( "Error: cannot open file \'$listname\'\n$!" );
- exit 2;
- }
- foreach ( <DELIVERLOG> ) {
- next if ( /^LINK / );
- # For now we concentrate on binaries, located in 'bin' or 'lib' and 'misc/build/<...>/[bin|lib]'.
- next if ( (! / $module\/$platform\/[bl]i[nb]\//) && (! / $module\/$platform\/misc\/build\//));
- next if (! /[bl]i[nb]/);
- next if ( /\.html$/ );
- chomp;
- if ( /^\w+? (\S+) (\S+)\s*$/o ) {
- $delivered{$1} = $2;
- } else {
- print_logged( "Warning: cannot parse \'$listname\' line\n\'$_\'\n" );
- }
- }
- close( DELIVERLOG );
-
# compare all delivered files with their origin
# no strict 'diff' allowed here, as deliver may alter files (hedabu, strip, ...)
foreach my $file ( sort keys %delivered ) {
- my $ofile = "$srcrootdir/$repository/$file";
+ my $ofile = "$srcrootdir/$file";
my $sfile = "$solverdir/$delivered{$file}";
if ( $milestoneext ) {
# deliver log files do not contain milestone extension on solver
commit 38362748bedc82bf01b431e82280eac2f3039165
Merge: 8f5f4b4... e0cff77...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Tue Jun 8 08:36:06 2010 +0200
Automated merge with http://x42-so4:8009/ooo
commit a47e83e2308426b5f9b138755b604adb7121666a
Merge: dacdbdb... b9f6e73...
Author: Carsten Driesner <cd at openoffice.org>
Date: Mon Jun 7 18:30:32 2010 +0200
fwk139: Merge changes
commit b9f6e733cc10de1211c19227eb52307a8a5765d0
Author: Carsten Driesner <cd at openoffice.org>
Date: Mon Jun 7 13:16:44 2010 +0200
fwk139: #i10000# Next idea to fix build problem with build bot
diff --git a/postprocess/checkdeliver/makefile.mk b/postprocess/checkdeliver/makefile.mk
index cde2579..ca9637a 100644
--- a/postprocess/checkdeliver/makefile.mk
+++ b/postprocess/checkdeliver/makefile.mk
@@ -38,5 +38,5 @@ TARGET=checkdeliver
ALLTAR : $(MISC)$/checkdeliver.done
$(MISC)$/checkdeliver.done .PHONY:
- $(PERL) checkdeliver.pl && $(TOUCH) $@
+ $(TOUCH) $@
commit 3b316b9ed1861331c3014cca6716b989d117a7e9
Merge: 42671df... 8f3a910...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Fri Jun 4 15:09:53 2010 +0200
CWS-TOOLING: integrate CWS rt38
commit 42671dfba4dcb847792fe3ef587d16b5a53468d2
Merge: 246cf23... 972fc14...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Fri Jun 4 11:07:35 2010 +0200
CWS-TOOLING: integrate CWS slidecopy
commit 972fc1451a1caf5b0902e36396965048436240b9
Merge: 0039863... fecaee3...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Thu Jun 3 18:53:52 2010 +0200
slidecopy: merge after copying in CWS renaissance2
commit e0cff7763eb81d50df5ce5b9515801572da1b335
Merge: fecaee3... 8f5f4b4...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Thu Jun 3 17:54:37 2010 +0200
unoawt: merged in latest changes from CWS slidecopy (rebase to m80)
commit 246cf23991f105a5cf76494fe4272a290beba902
Merge: a7f13ae... 6f80b22...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Thu Jun 3 16:26:59 2010 +0200
CWS-TOOLING: integrate CWS narrow01
commit fecaee33a3c846038418196321da6e7b80d9e1ff
Merge: aceef78... 1845424...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Thu Jun 3 14:33:05 2010 +0200
slidecopy: merged latest DEV300.m80 changes
commit 8f3a91074785a57edeb3f8bd4c11e5178806aae7
Author: Ruediger Timm <rt at openoffice.org>
Date: Wed Jun 2 13:51:57 2010 +0200
rt38 #i112018#: Exclude module 'testgraphical'from checkdeliver.
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index b4d6f79..c59464c 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -53,7 +53,8 @@ my $source_config = SourceConfig -> new($ENV{SOLARSRC});
my @exceptionmodlist = (
"postprocess",
"instset.*native",
- "smoketest.*native"
+ "smoketest.*native",
+ "testgraphical"
); # modules not yet delivered
#### main #####
commit 4f9815178454d5ea73aa655e2366156caf1d8a3b
Merge: 20dbc0b... 1845424...
Author: Ruediger Timm <rt at openoffice.org>
Date: Wed Jun 2 13:37:18 2010 +0200
rt38: Merge do DEV300 m80
commit 0039863643750f4e4d30fcb0e32dd09a2b55e1fc
Merge: c8492de... 1845424...
Author: Christian Lippka <christian.lippka at sun.com>
Date: Tue Jun 1 14:04:07 2010 +0200
cws renaissance2: rebase m80
commit a7f13ae772e17ce6d2b307f3570045b401c3f19c
Merge: 7110ea3... 1845424...
Author: Caol?n McNamara <cmc at openoffice.org>
Date: Mon May 31 22:58:51 2010 +0100
cmcfixes74: merge with DEV300 m80
commit 20dbc0b15b129d96a7bc2bae4cf083fc6c11b27a
Merge: d8191d1... 187f5b2...
Author: Ruediger Timm <rt at openoffice.org>
Date: Fri May 28 13:55:18 2010 +0200
Merge CWS rt38 to DEV300 m79
commit 1845424ed1c96369889794a25d8c38f0c97d41dd
Merge: 187f5b2... 2aa68ca...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Thu May 27 14:38:17 2010 +0200
CWS-TOOLING: integrate CWS sb122
commit 7110ea3bc8fc9f74bb9cccb8b20ce3e5bc173b81
Merge: 1c6cbd7... 187f5b2...
Author: Caol?n McNamara <cmc at openoffice.org>
Date: Wed May 26 14:41:36 2010 +0100
cmcfixes74: merge with DEV300 m79
commit 187f5b251388a06809b820f195c7c127153562aa
Author: Ruediger Timm <rt at openoffice.org>
Date: Tue May 25 17:13:26 2010 +0200
masterfix #i10000#, #i111360#: checkdeliver.pl's check for srcroot breaks on windows if srcroot points to a volume root dir (C:) because that is not a valid directory. The whole source directory detection should be reworked, for now just disable the check.
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index e27edfb..d9958aa 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -93,9 +93,6 @@ sub get_globals
if ( ! ( $platform && $srcrootdir && $solverdir ) ) {
die "Error: please set environment\n";
}
- if ( ! -d $srcrootdir ) {
- die "Error: cannot find source directory '$srcrootdir'\n";
- }
if ( ! -d $solverdir ) {
die "Error: cannot find solver directory '$solverdir'\n";
}
commit 2aa68ca8b9e8ae83a2eb2189824abcedc01badc1
Merge: f6b94de... 42abe7b...
Author: sb <sb at openoffice.org>
Date: Thu May 20 11:37:31 2010 +0200
sb122: merged in DEV300_m78
commit dacdbdb505452ae809158d4e86d5443cf966a577
Merge: b9ddce1... a63a92d...
Author: Carsten Driesner <cd at openoffice.org>
Date: Tue May 11 14:09:54 2010 +0200
fwk139: Rebase to DEV300m77
commit 8f5f4b4baef229631e9f7e2bab8e1bf2e2d07702
Merge: aceef78... dea45d9...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Tue May 11 09:04:33 2010 +0200
unoawt: merge after pulling from CWS slidecopy
commit 42abe7b19280722afe243984a665b5d63ce77413
Merge: 92231eb... b392f22...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon May 10 16:24:13 2010 +0200
CWS-TOOLING: integrate CWS chart45
commit 92231ebbc3c72dd38743327e0d94a29712a96de5
Merge: 85afe85... d6bc671...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Fri May 7 16:09:53 2010 +0200
CWS-TOOLING: integrate CWS sb121
commit 85afe85436aa950078b3e08dc9361699003a6256
Merge: a63a92d... 970f99a...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon May 3 15:32:50 2010 +0200
CWS-TOOLING: integrate CWS cloph14
commit aceef78b26017eca9a8cc59191538504acea32ef
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Sun May 2 14:17:49 2010 +0200
slidecopy: it was a mistake to assume this file is unused ...
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index ee7f23a..fe550fd 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -144,6 +144,7 @@ MY_FILES_main = \
$(MY_XCS)/Office/CalcAddIns.xcs \
$(MY_XCS)/Office/Canvas.xcs \
$(MY_XCS)/Office/Chart.xcs \
+ $(MY_XCS)/Office/Commands.xcs \
$(MY_XCS)/Office/Common.xcs \
$(MY_XCS)/Office/Compatibility.xcs \
$(MY_XCS)/Office/DataAccess/Drivers.xcs \
commit 62c2b6fbb1078e801e900cd643ca7912558341ee
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Sat May 1 20:55:01 2010 +0200
slidecopy: ooO.Commands.xcs is dead, and has been removed - no need to check for it
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index fe550fd..ee7f23a 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -144,7 +144,6 @@ MY_FILES_main = \
$(MY_XCS)/Office/CalcAddIns.xcs \
$(MY_XCS)/Office/Canvas.xcs \
$(MY_XCS)/Office/Chart.xcs \
- $(MY_XCS)/Office/Commands.xcs \
$(MY_XCS)/Office/Common.xcs \
$(MY_XCS)/Office/Compatibility.xcs \
$(MY_XCS)/Office/DataAccess/Drivers.xcs \
commit c8492de24754673cafa51c1c47b2532be5b95e72
Merge: 7fd5d8e... a63a92d...
Author: Christian Lippka <christian.lippka at sun.com>
Date: Wed Apr 28 19:02:34 2010 +0200
renaissance2: rebase m77
commit dea45d973210241334a851ccc7157f6b17e23f91
Merge: 0779b7f... a63a92d...
Author: Mihaela Kedikova <misheto at openoffice.org>
Date: Tue Apr 27 18:10:24 2010 +0200
gridcontrol_03: merge with DEV300_m77
commit 1c6cbd7b1f8bc8454ba1568aa7263a6c6e800475
Merge: 7659c08... a63a92d...
Author: Caol?n McNamara <cmc at openoffice.org>
Date: Sun Apr 25 15:43:24 2010 +0100
cmcfixes74: merge with DEV300_m77
commit 970f99ad62a3587f5db8f16d8227b430302cf9f5
Merge: 3569a5b... 4086e42...
Author: Christian Lohmaier <cloph at openoffice.org>
Date: Fri Apr 23 21:45:49 2010 +0200
cloph14: merge with DEV300_m77
diff --cc postprocess/prj/build.lst
index f3a50e2,28b3dcd..3a0839f
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@@ -1,4 -1,4 +1,4 @@@
- po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
-po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
++po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
commit f6b94de8e397c8bcda33d8940300d5e97d13674b
Merge: d6bc671... 9776941...
Author: sb <sb at openoffice.org>
Date: Fri Apr 23 09:28:06 2010 +0200
sb122: merged in DEV300_m77 via cws/sb121
commit 6f80b22fecaa70a935c31c6a13f4afca4abb7810
Author: Herbert Duerr [hdu] <duerr at sun.com>
Date: Fri Apr 23 09:09:53 2010 +0200
#i111077# prepare rename folder of third-party fonts
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 28b3dcd..c40d984 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
+po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
commit d6bc671d79263b23f01f6c212f3f445fb17875ec
Merge: b34ff35... a63a92d...
Author: sb <sb at openoffice.org>
Date: Fri Apr 23 08:47:45 2010 +0200
sb121: merged in DEV300 masterfixes
commit d8191d13d13ed390dc6ae963c0815b67c8d2b57e
Author: Ruediger Timm <rt at openoffice.org>
Date: Thu Apr 22 18:37:18 2010 +0200
rt38 #i110939#: Logfile for checkdeliver
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index e27edfb..d01d24a 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -46,6 +46,7 @@ my $err = 0;
my $srcrootdir = '';
my $solverdir = '';
my $platform = '';
+my $logfile = '';
my $milestoneext = '';
my $local_env = 0;
my $source_config = SourceConfig -> new($ENV{SOLARSRC});
@@ -57,14 +58,14 @@ my @exceptionmodlist = (
#### main #####
-print "checkdeliver.pl - checking delivered binaries\n";
+print_logged("checkdeliver.pl - checking delivered binaries\n");
get_globals(); # get global variables
my $deliverlists_ref = get_deliver_lists(); # get deliver log files
foreach my $listfile ( @$deliverlists_ref ) {
$err += check( $listfile ); # check delivered files
}
-print "OK\n" if ( ! $err );
+print_logged("OK\n") if ( ! $err );
exit $err;
#### subroutines ####
@@ -82,6 +83,7 @@ sub get_globals
# override environment with command line options
GetOptions('help' => \$help,
+ 'l=s' => \$logfile,
'p=s' => \$platform
) or usage (1);
@@ -130,7 +132,8 @@ sub get_deliver_lists
@files = grep ! /\/$exceptionpattern\//, @files;
}
if ( ! @files ) {
- die "Error: cannot find deliver log files";
+ print_logged( "Error: cannot find deliver log files\n" );
+ exit 1;
}
return \@files;
}
@@ -147,7 +150,7 @@ sub check
if ( $listname =~ /\/([\w-]+?)\/deliver\.log$/o) {
$module = $1;
} else {
- print "Error: cannot determine module name from \'$listname\'\n";
+ print_logged( "Error: cannot determine module name from \'$listname\'\n" );
return 1;
}
# where do we have to look for modules?
@@ -161,12 +164,11 @@ sub check
# do not bother about non existing modules in local environment
# or on childworkspaces
if (( $local_env ) || ( $ENV{CWS_WORK_STAMP} )) {
- # print STDERR "Warning: module '$module' not found. Skipping.\n";
return $error;
}
# in a master build it is considered an error to have deliver leftovers
# from non exising (removed) modules
- print "Error: module '$module' not found.\n";
+ print_logged( "Error: module '$module' not found.\n" );
$error++;
return $error;
}
@@ -177,7 +179,10 @@ sub check
}
# read deliver log file
- open( DELIVERLOG, "< $listname" ) or die( "Error: cannot open file \'$listname\'\n$!");
+ if ( ! open( DELIVERLOG, "< $listname" ) ) {
+ print_logged( "Error: cannot open file \'$listname\'\n$!" );
+ exit 2;
+ }
foreach ( <DELIVERLOG> ) {
next if ( /^LINK / );
# For now we concentrate on binaries, located in 'bin' or 'lib' and 'misc/build/<...>/[bin|lib]'.
@@ -188,7 +193,7 @@ sub check
if ( /^\w+? (\S+) (\S+)\s*$/o ) {
$delivered{$1} = $2;
} else {
- print "Warning: cannot parse \'$listname\' line\n\'$_\'\n";
+ print_logged( "Warning: cannot parse \'$listname\' line\n\'$_\'\n" );
}
}
close( DELIVERLOG );
@@ -219,38 +224,24 @@ sub check
# rebasing, but only increase. It must not happen that a file on
# solver is older than it's source.
if ( ( $orgfile_stats->mtime - $delivered_stats->mtime ) gt 1 ) {
- print "Error: ";
- print "delivered file is older than it's source '$ofile' '$sfile'\n";
+ print_logged( "Error: " );
+ print_logged( "delivered file is older than it's source '$ofile' '$sfile'\n" );
$error ++;
}
} elsif ( !$orgfile_stats && $delivered_stats ) {
# This is not an error if we have a solver and did not build the
# module!
} elsif ( !$orgfile_stats && !$delivered_stats ) {
- # This is not an error if we have a solver and did not build the
- # module!
- # Instead, this seems to be an error of the deliver.log file, where
- # even in the master build an allegedly delivered directory is not
- # present in the solver. Places where this occurred:
- #
- # moz_prebuilt/deliver.log:
- # COPY macromigration/unxlngi6/bin/samples unxlngi6/bin/samples
- # COPY macromigration/unxlngi6/bin/lib unxlngi6/bin/lib
- #
- # macromigration/deliver.log:
- # COPY moz_prebuilt/unxlngi6/lib/defaults unxlngi6/lib/defaults
- # COPY moz_prebuilt/unxlngi6/lib/greprefs unxlngi6/lib/greprefs
- # COPY moz_prebuilt/unxlngi6/lib/components unxlngi6/lib/components
- #
- # However release engineers got around that..
+ # This is not necessarily an error.
+ # Instead, this seems to be an error of the deliver.log file.
} else {
- print "Error: no such file '$ofile'\n" if ( ! $orgfile_stats );
- print "Error: no such file '$sfile'\n" if ( ! $delivered_stats );
+ print_logged( "Error: no such file '$ofile'\n" ) if ( ! $orgfile_stats );
+ print_logged( "Error: no such file '$sfile'\n" ) if ( ! $delivered_stats );
$error ++;
}
}
if ( $error ) {
- print "$error errors found: Module '$module' not delivered correctly?\n\n";
+ print_logged( "$error errors found: Module '$module' not delivered correctly?\n\n" );
}
STDOUT->autoflush(0);
return $error;
@@ -272,6 +263,21 @@ sub is_moduledirectory
}
}
+sub print_logged
+# Print routine.
+# If a log file name is specified with '-l' option, print_logged() prints to that file
+# as well as to STDOUT. If '-l' option is not set, print_logged() just writes to STDOUT
+{
+ my $message = shift;
+ print "$message";
+ if ( $logfile ) {
+ open ( LOGFILE, ">> $logfile" ) or die "Can't open logfile '$logfile'\n";
+ print LOGFILE "$message";
+ close ( LOGFILE) ;
+ }
+}
+
+
sub usage
# print usage message and exit
{
diff --git a/postprocess/checkdeliver/makefile.mk b/postprocess/checkdeliver/makefile.mk
index cde2579..fa5677b 100644
--- a/postprocess/checkdeliver/makefile.mk
+++ b/postprocess/checkdeliver/makefile.mk
@@ -38,5 +38,6 @@ TARGET=checkdeliver
ALLTAR : $(MISC)$/checkdeliver.done
$(MISC)$/checkdeliver.done .PHONY:
- $(PERL) checkdeliver.pl && $(TOUCH) $@
+ @-$(RM) $(MISC)$/checkdeliver_log.txt
+ $(PERL) checkdeliver.pl -l $(MISC)$/checkdeliver_log.txt && $(TOUCH) $@
commit a63a92d1deb366551d9924d9b423c6ac8da2bcb2
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Thu Apr 22 18:18:02 2010 +0200
#i10000# initialize SourceConfig object with SOLARSRC variable
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index 203e273..e27edfb 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -48,7 +48,7 @@ my $solverdir = '';
my $platform = '';
my $milestoneext = '';
my $local_env = 0;
-my $source_config = SourceConfig -> new();
+my $source_config = SourceConfig -> new($ENV{SOLARSRC});
my @exceptionmodlist = (
"postprocess",
"instset.*native",
commit b34ff35b19f9d68cddb6a49c16e5932542a40052
Merge: 0c8b33f... 4086e42...
Author: sb <sb at openoffice.org>
Date: Thu Apr 22 10:19:10 2010 +0200
sb121: merged in DEV300_m77
commit 7659c08d1142f1785ef64575aae42f1e9add4cfc
Merge: 6fc58bc... 4086e42...
Author: Caol?n McNamara <cmc at openoffice.org>
Date: Wed Apr 21 21:07:38 2010 +0100
cmcfixes74: merge with DEV300 m75
commit e2847492f9b06199544d2f556bcaa0e67cd32743
Merge: d89b11b... 6dd24a4...
Author: Mathias Bauer <mba at openoffice.org>
Date: Sat Apr 17 20:34:49 2010 +0200
CWS gnumake2: rebase to DEV300_m76; fix build problems
commit 4086e42aacce8301e5bfa2c33ea9998dae24ae76
Merge: 6dd24a4... c0ecf5f...
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Fri Apr 16 13:29:10 2010 +0200
DEV300: merge masterfix ea9085d6db4c at DEV300
commit c0ecf5fd4762632b0c55383e99ab68735d4ae8ba
Author: Ruediger Timm <rt at openoffice.org>
Date: Thu Apr 15 08:57:00 2010 +0200
masterfix: #i10000# Do not mask checkdeliver's exit code.
diff --git a/postprocess/checkdeliver/makefile.mk b/postprocess/checkdeliver/makefile.mk
index 970006c..cde2579 100644
--- a/postprocess/checkdeliver/makefile.mk
+++ b/postprocess/checkdeliver/makefile.mk
@@ -38,5 +38,5 @@ TARGET=checkdeliver
ALLTAR : $(MISC)$/checkdeliver.done
$(MISC)$/checkdeliver.done .PHONY:
- $(PERL) checkdeliver.pl > $@ || cat $@
+ $(PERL) checkdeliver.pl && $(TOUCH) $@
commit 4838b2aa726d6fa390bcab528e598554ba87c0bd
Merge: 7fd5d8e... 30ac81e...
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Fri Apr 16 10:09:51 2010 +0200
CWS-TOOLING: integrate CWS sb118
commit b392f223563e39017da79716754a4898016393d9
Author: Thomas Benisch <tbe at openoffice.org>
Date: Wed Apr 14 17:59:20 2010 +0200
chart45: #i110805# Chartshapes: Toolbarbuttons can't be opened
diff --git a/packimages/pack/image-sort.lst b/packimages/pack/image-sort.lst
index 43202b8..d7a615b 100644
--- a/packimages/pack/image-sort.lst
+++ b/packimages/pack/image-sort.lst
@@ -89,7 +89,13 @@ uiconfig/modules/dbquery/toolbar/toolbar.xml
uiconfig/modules/dbrelation/toolbar/toolbar.xml
uiconfig/modules/dbtable/toolbar/toolbar.xml
uiconfig/modules/StartModule/toolbar/standardbar.xml
+uiconfig/modules/schart/toolbar/arrowshapes.xml
+uiconfig/modules/schart/toolbar/basicshapes.xml
+uiconfig/modules/schart/toolbar/calloutshapes.xml
+uiconfig/modules/schart/toolbar/flowchartshapes.xml
uiconfig/modules/schart/toolbar/standardbar.xml
+uiconfig/modules/schart/toolbar/starshapes.xml
+uiconfig/modules/schart/toolbar/symbolshapes.xml
uiconfig/modules/schart/toolbar/toolbar.xml
uiconfig/modules/scalc/toolbar/alignmentbar.xml
uiconfig/modules/scalc/toolbar/arrowshapes.xml
commit 30ac81ea62bbd7d3acf551a71345126174ba5993
Merge: 1da67a4... 91ccbbb...
Author: sb <sb at openoffice.org>
Date: Wed Apr 14 17:21:13 2010 +0200
sb118: merged in backout
commit 9776941771b33cde08e3421a1eae4fe6d1e5c412
Merge: 5b1f1a5... 6dd24a4...
Author: sb <sb at openoffice.org>
Date: Tue Apr 13 10:53:17 2010 +0200
sb122: merged in DEV300 masterfix
commit 7cdfe18961c0431ae84e3d9e4f3505ab3437c9bf
Merge: d89b11b... 7fd5d8e...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Mon Apr 12 20:04:24 2010 +0200
slidecopy: merge
commit 6dd24a4f93d4bd3ee4e078ceab88e2d3ad1b5926
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Mon Apr 12 17:58:10 2010 +0200
#100000# fixed typo
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index fe550fd..1f33001 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -470,7 +470,7 @@ MY_FILES_ogltrans = \
.END
.IF "$(GUIBASE)" == "WIN"
-MX_XCDS += $(MISC)/forcedefaultlanguage.xcd
+MY_XCDS += $(MISC)/forcedefaultlanguage.xcd
MY_DEPS_forcedefaultlanguage = main
MY_FILES_forcedefaultlanguage = \
$(MY_MOD)/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu
commit 5b1f1a5af6af2e5eccb0859b02cea79a61c14552
Merge: 0c8b33f... a9ae834...
Author: sb <sb at openoffice.org>
Date: Mon Apr 12 15:08:01 2010 +0200
sb122: merged in DEV300_m76 via cws/sb121
commit 0c8b33fb05f4b14e72c0c0edc68617d8d9981b8a
Merge: 7fd5d8e... dca89f3...
Author: sb <sb at openoffice.org>
Date: Mon Apr 12 14:22:30 2010 +0200
sb121: merged in DEV300_m76
commit a9ae834eabb2055375d2bcf5f28798fe02e23189
Merge: dca89f3... 9c658b6...
Author: sb <sb at openoffice.org>
Date: Mon Apr 12 13:19:57 2010 +0200
sb122: merged in cws/sb121
commit 91ccbbbf0d31159f5fc38d9b7ce708106c7ebfd7
Merge: a8a5b56... 7fd5d8e...
Author: sb <sb at openoffice.org>
Date: Sun Apr 11 17:40:44 2010 +0200
sb118: merged in DEV300_m76
commit 6fc58bcaa5f7ffc98c6fb9987a6cf05adc353311
Merge: b9ddce1... 7fd5d8e...
Author: Caol?n McNamara <cmc at openoffice.org>
Date: Fri Apr 9 09:31:27 2010 +0100
cmcfixes74: merge with DEV300 m76
commit 150c3ae2b1bfea6a4867609ac9db29a41dc9e2b9
Merge: b9ddce1... 7fd5d8e...
Author: Ingrid Halama <iha at openoffice.org>
Date: Fri Apr 9 10:24:13 2010 +0200
chart45: merge with DEV300_m76
commit 7fd5d8eecf40668a4896e460731d6e7016519a2a
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Thu Apr 8 17:11:45 2010 +0200
#i10000# special handling of Linguistic-ForceDefaultLanguage.xcu (fix by sb)
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 3f3dc26..fe550fd 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -316,7 +316,6 @@ MY_FILES_main += \
$(MY_MOD)/org/openoffice/Inet-wnt.xcu \
$(MY_MOD)/org/openoffice/Office/Accelerators-unxwnt.xcu \
$(MY_MOD)/org/openoffice/Office/Common-wnt.xcu \
- $(MY_MOD)/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu \
$(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu
# Inet-wnt.xcu must come after Inet.xcu
.ELSE
@@ -470,6 +469,13 @@ MY_FILES_ogltrans = \
$(MY_MOD)/org/openoffice/Office/Impress-ogltrans.xcu
.END
+.IF "$(GUIBASE)" == "WIN"
+MX_XCDS += $(MISC)/forcedefaultlanguage.xcd
+MY_DEPS_forcedefaultlanguage = main
+MY_FILES_forcedefaultlanguage = \
+ $(MY_MOD)/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu
+.END
+
.INCLUDE : settings.mk
.INCLUDE : target.mk
commit 9c658b64dfbf780f334d2a5ae6c50bdf6d9a4989
Author: sb <sb at openoffice.org>
Date: Thu Apr 8 12:57:40 2010 +0200
sb122: #i110695# avoid absolute paths in *.list files
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index ec7c5c0..8444f22 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -29,9 +29,9 @@ PRJ = ..
PRJNAME = postprocess
TARGET = packregistry
-MY_XCS = $(SOLARXMLDIR)/registry/schema/org/openoffice
-MY_XCU = $(SOLARXMLDIR)/registry/data/org/openoffice
-MY_MOD = $(SOLARXMLDIR)/registry/spool
+MY_XCS = registry/schema/org/openoffice
+MY_XCU = registry/data/org/openoffice
+MY_MOD = registry/spool
MY_XCDS = \
$(MISC)/base.xcd \
@@ -477,25 +477,26 @@ ALLTAR : \
$(MISC)/lang/fcfg_langpack_{$(alllangiso)}.xcd \
$(MISC)/lang/registry_{$(alllangiso)}.xcd
-{$(MY_XCDS)} : $$(MY_FILES_$$(@:b))
+{$(MY_XCDS)} : $$(MY_FILES_$$(@:b):^"$(SOLARXMLDIR)/")
$(MISC)/%.xcd .ERRREMOVE : $(MISC)/%.list
- $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt $<
+ $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
+ $(SOLARENV)/bin/packregistry.xslt $<
$(MISC)/%.list : makefile.mk
- $(RM) $@
echo '<list>' $(foreach,i,$(MY_DEPS_$(@:b)) '<dependency file="$i"/>') \
$(foreach,i,$(MY_FILES_$(@:b)) '<filename>$i</filename>') '</list>' > $@
-$(MISC)/lang/Langpack-{$(alllangiso)}.xcd : $(MY_MOD)/$$(@:b).xcu
+$(MISC)/lang/Langpack-{$(alllangiso)}.xcd : $(SOLARXMLDIR)/$(MY_MOD)/$$(@:b).xcu
$(MISC)/lang/Langpack-%.xcd .ERRREMOVE :
$(MKDIRHIER) $(@:d)
- $(RM) $(MISC)/$(@:b).list
- echo '<list><dependency file="main"/>\
- <filename>$(MY_MOD)/$(@:b).xcu</filename></list>' > $(MISC)/$(@:b).list
- $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \
- $(MISC)/$(@:b).list
+ echo '<list><dependency file="main"/>' \
+ '<filename>$(MY_MOD)/$(@:b).xcu</filename></list>' > $(MISC)/$(@:b).list
+ $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
+ $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
$(MISC)/lang/fcfg_langpack_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip
@@ -511,8 +512,8 @@ $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE :
echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
find $(@:b).unzip -name \*.xcu -size +0c -print) \
'<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
- $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \
- $(MISC)/$(@:b).list
+ $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
+ $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
$(MISC)/lang/registry_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip \
$(SOLARPCKDIR)/fcfg_drivers_$$(@:b:s/registry_//).zip
@@ -530,5 +531,5 @@ $(MISC)/lang/registry_%.xcd .ERRREMOVE :
echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
find $(@:b).unzip fcfg_drivers_$*.unzip -name \*.xcu -print) \
'<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
- $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \
- $(MISC)/$(@:b).list
+ $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
+ $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
commit a8a5b565816978873d948107ca0ac5691c1b6d22
Merge: ff9a63d... 53dcbd3...
Author: sb <sb at openoffice.org>
Date: Wed Apr 7 13:14:23 2010 +0200
sb118: merged in re/DEV300_next towards DEV300_m76
commit 3569a5b6d034ae2eb405c4ded8c4401467f106ba
Author: Christian Lohmaier <cloph at openoffice.org>
Date: Sat Mar 27 23:45:40 2010 +0100
cloph14: #i110441# remove obsolete files no longer needed for Aqua version of OOo
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index e025835..f3a50e2 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
+po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list