diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-19 16:36:58 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-19 16:36:58 +0100 |
| commit | 6737e8a590ca3acc2687fe9215af53bc44327ef8 (patch) | |
| tree | 08aa4f68a21d2e1551831e28989b6ec2ab2a67fc /postprocess | |
| parent | 58927791c51e0063cdcd2c9dc40c6e291274238e (diff) | |
| parent | f76195e73d39cc2591920544accf5d69d9afea5a (diff) | |
gnumake3: mergeing changes from DEV300_m97, fixing jars for svl complex test, deliver globlmn.hrc for now, adding component registration for svx libraries, still misses gengal and friends when packing
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 7 | ||||
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 537a62be4ba5..d1be23dd4083 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -65,6 +65,9 @@ my_components = \ component/svtools/source/hatchwindow/hatchwindowfactory \ component/svtools/source/productregistration/productregistration.uno \ component/svtools/util/svt \ + component/svx/util/svx \ + component/svx/util/svxcore \ + component/svx/util/textconversiondlgs \ component/sw/util/msword \ component/sw/util/sw \ component/sw/util/swd \ @@ -109,6 +112,7 @@ my_components = \ log \ mcnttype \ migrationoo2 \ + msfilter \ msforms \ mysql \ odbc \ @@ -148,11 +152,8 @@ my_components = \ srtrs1 \ stringresource \ svgfilter \ - svx \ - svxcore \ syssh \ t602filter \ - textconversiondlgs \ tvhlp1 \ ucb1 \ ucpchelp1 \ diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index a6881783776a..4109bfdaae97 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 |