diff options
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | packimages/pack/makefile.mk | 7 | ||||
| -rw-r--r-- | postprocess/checkdeliver/checkdeliver.pl | 2 | ||||
| -rw-r--r-- | postprocess/checkdeliver/makefile.mk | 5 | ||||
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 5 | ||||
| -rw-r--r-- | postprocess/prj/build.lst | 2 |
6 files changed, 23 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..50784a43df04 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +# backup and temporary files +*~ +.*.sw[op] + +# the build directories +/*/unxlng?? +/*/unxlng??.pro +/*/wntmsci?? +/*/wntmsci??.pro diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk index c8feef308e2b..471f5b585403 100644 --- a/packimages/pack/makefile.mk +++ b/packimages/pack/makefile.mk @@ -36,8 +36,9 @@ 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=hicontrast crystal oxygen tango classic 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 @@ -92,7 +93,7 @@ $(MISC)$/oxygen.flag : $(OXYGEN_TARBALL) # unpack the classic icon set $(MISC)$/classic.flag : $(CLASSIC_TARBALL) - cd $(MISC) && gunzip -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f) + cd $(MISC) && gunzip -d -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f) .IF "$(GUI)"=="UNX" chmod -R g+w $(MISC)$/classic .ENDIF diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl index a2c3800940ca..4ab64cdb39af 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}; diff --git a/postprocess/checkdeliver/makefile.mk b/postprocess/checkdeliver/makefile.mk index dfbd5c317de1..ad6f5c0db524 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 f1319801998f..a6881783776a 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_DATA)" != "" +MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-externallibtextcatdata.xcu +.ELSE +MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-internallibtextcatdata.xcu +.END MY_DEPS_math = main MY_FILES_math = \ diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index c40d98458025..c7601293a273 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 LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver NULL po postprocess usr1 - all po_mkout NULL po postprocess\checkxml nmake - all po_checkxml NULL po postprocess\checkdeliver nmake - all po_checkdlv NULL |