diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-01-29 18:09:29 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-01-29 18:09:29 +0000 |
| commit | 14aa6a1a3293dd3d101266b9fe479c2d7bd2a4c6 (patch) | |
| tree | 9e884f4ada5261a4f431f90bb5ddd54e8a8f7bd4 /connectivity | |
| parent | 3c550e9f7bdd8c9f1f75f4148f516ddc94290f92 (diff) | |
#i107957 - deliver right .xcu, no matter how WITH_LANG is set
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/prj/d.lst | 4 | ||||
| -rwxr-xr-x | connectivity/util/makefile.mk | 37 |
2 files changed, 31 insertions, 10 deletions
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst index 728c8fef03c4..8b5aaa1c60eb 100644 --- a/connectivity/prj/d.lst +++ b/connectivity/prj/d.lst @@ -28,6 +28,6 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\DataAccess ..\%__SRC%\inc\sqlbison.hxx %_DEST%\inc%_EXT%\connectivity\sqlbison.hxx ..\inc\connectivity\sdbcx\*.hxx %_DEST%\inc%_EXT%\connectivity\sdbcx\*.hxx #..\version.mk %_DEST%\inc%_EXT%\connectivity\version.mk -..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu +..\%__SRC%\misc\lang\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu ..\%COMMON_OUTDIR%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip -..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
\ No newline at end of file +..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip diff --git a/connectivity/util/makefile.mk b/connectivity/util/makefile.mk index 805aa0110f6f..2f252cb907b6 100755 --- a/connectivity/util/makefile.mk +++ b/connectivity/util/makefile.mk @@ -47,7 +47,7 @@ DIR_LANG_SOURCE := $(MISC)$/merge DIR_LANG_SOURCE := $(MISC)$/registry$/data .ENDIF DRIVER_MERGE_XCU := $(shell -@$(FIND) $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess -name "*.xcu") - +DRIVER_MERGE_DEST = $(MISC)/lang/{$(DRIVER_MERGE_XCU:f)} REALFILTERPACKAGES_FILTERS_UI_LANGPACKS = \ $(foreach,i,$(alllangiso) $(foreach,j,$(DRIVER_MERGE_XCU) $(DIR_LANGPACK)$/$i$/org$/openoffice$/Office$/DataAccess$/$(j:f))) @@ -58,12 +58,12 @@ PACKLANG_IN := PACKLANG_PARAM := --stringparam PACKLANG_XSL := -$(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS) :
- @echo ===================================================================
- @echo Building language package for driver $(@:b:s/Filter_//)
- @echo ===================================================================
- +-$(MKDIRHIER) $(@:d)
- $(PACKLANG) $(PACKLANG_PARAM) lang $(@:d:d:d:d:d:d:d:d:d:d:b) $(PACKLANG_XSL) langfilter.xsl $(PACKLANG_IN) $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess$/$(@:f) > $@
+$(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS) : + @echo =================================================================== + @echo Building language package for driver $(@:b:s/Filter_//) + @echo =================================================================== + +-$(MKDIRHIER) $(@:d) + $(PACKLANG) $(PACKLANG_PARAM) lang $(@:d:d:d:d:d:d:d:d:d:d:b) $(PACKLANG_XSL) langfilter.xsl $(PACKLANG_IN) $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess$/$(@:f) > $@ $(MISC)$/$(TARGET)_delzip : -$(RM) $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip @@ -76,5 +76,26 @@ $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip : $(REALFILTERPACKAGES_FILTERS_UI_LANGP ALLTAR: \ $(MISC)$/$(TARGET)_delzip \ - $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip + $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip \ + $(MISC)/lastlang.mk + +.IF "$(DRIVER_MERGE_DEST)"!="" +.INCLUDE .IGNORE : $(MISC)/lastlang.mk + +ALLTAR : \ + $(DRIVER_MERGE_DEST) + +.IF "$(LAST_LANGS)"!="$(WITH_LANG)" +DO_PHONY=.PHONY +.ENDIF # "$(LAST_LANG)"!="$(WITH_LANG)" + +$(MISC)/lang/%.xcu $(DO_PHONY) : $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess/%.xcu + @@-$(MKDIRHIER) $(@:d:d) + $(COPY) $< $@ + +.ENDIF # "$(DRIVER_MERGE_DEST)"!="" + +$(MISC)/lastlang.mk $(DO_PHONY) : + $(RM) $@ + echo LAST_LANGS=$(WITH_LANG) > $@ |