Author: jani Date: Tue Oct 1 18:14:04 2013 New Revision: 1528168 URL: http://svn.apache.org/r1528168 Log: .xrm merge integrated in build system and tested with module readlicense_ooo
Modified: openoffice/branches/l10n40/main/solenv/inc/rules.mk openoffice/branches/l10n40/main/solenv/inc/tg_config.mk Modified: openoffice/branches/l10n40/main/solenv/inc/rules.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/rules.mk?rev=1528168&r1=1528167&r2=1528168&view=diff ============================================================================== --- openoffice/branches/l10n40/main/solenv/inc/rules.mk (original) +++ openoffice/branches/l10n40/main/solenv/inc/rules.mk Tue Oct 1 18:14:04 2013 @@ -704,28 +704,6 @@ $(COMMONMISC)/$(TARGET)/%.xrb : %.xrb $(COMMAND_ECHO)$(XMLEX) -t xrb -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ $(COMMAND_ECHO)-$(RM) $@.$(INPATH) - -$(COMMONMISC)/$(MYPATH)/%.xrm : %.xrm - $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d) - $(COMMAND_ECHO)-$(RM) $@ - @echo trysdf = $(TRYSDF) - $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all - $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ - $(COMMAND_ECHO)-$(RM) $@.$(INPATH) - -#$(COMMONMISC)/$(TARGET)/%.xrm : %.xrm -# -$(MKDIRHIER) $(@:d) -# -$(RM) $@ -# $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all -# $(RENAME) $@.$(INPATH) $@ -# -$(RM) $@.$(INPATH) -# -#$(COMMONMISC)/%.xrm : %.xrm -# -$(MKDIR) $(@:d) -# -$(RM) $@ -# $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all -# $(RENAME) $@.$(INPATH) $@ -# -$(RM) $@.$(INPATH) .ENDIF # "$(WITH_LANG)"!="" .IF "$(WITH_LANG)"!="" @@ -763,11 +741,18 @@ $(COMMONMISC)/$(TARGET)/%.uulf : $$(@:b) # This is still needed????? $(COMMONMISC)/$(TARGET)/%.xrm : %.xrm + @echo jan start $(COMMAND_ECHO)-$(MKDIR) $(@:d) $(COMMAND_ECHO)-$(RM) $@ - $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all - $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ - $(COMMAND_ECHO)-$(RM) $@.$(INPATH) + $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source "$(WITH_LANG)" -t $(@:d) -v -d -f $< +# $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $(@:d) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all +# $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ +# $(COMMAND_ECHO)-$(RM) $@.$(INPATH) + + + + + # dirty hack # if local *.sdf file is missing Modified: openoffice/branches/l10n40/main/solenv/inc/tg_config.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/tg_config.mk?rev=1528168&r1=1528167&r2=1528168&view=diff ============================================================================== --- openoffice/branches/l10n40/main/solenv/inc/tg_config.mk (original) +++ openoffice/branches/l10n40/main/solenv/inc/tg_config.mk Tue Oct 1 18:14:04 2013 @@ -133,7 +133,7 @@ $(XCU_LANG) : $(LOCALIZESDF) $(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcu : %.xcu @-$(MKDIRHIER) $(@:d) - $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source "$(WITH_LANG)" -t $(PROCESSOUT)/merge/$(PACKAGEDIR) -v -d -f $< + $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source "$(WITH_LANG)" -t $(PROCESSOUT)/merge/$(PACKAGEDIR) -v -f $<