diff options
| author | Andras Timar <atimar@suse.com> | 2012-11-20 15:03:34 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-11-20 15:03:34 +0100 |
| commit | fa88b3717d58410f6318c520b0397000f86b9720 (patch) | |
| tree | ad8f1b2135ebe8045de55e5af233ff442d901444 /solenv/inc | |
| parent | Updated core (diff) | |
| parent | Updated core (diff) | |
| download | core-fa88b3717d58410f6318c520b0397000f86b9720.tar.gz core-fa88b3717d58410f6318c520b0397000f86b9720.zip | |
Merge branch 'feature/killsdf'
Conflicts:
desktop/prj/build.lst
helpcontent2
l10ntools/Executable_gsicheck.mk
l10ntools/Executable_uiex.mk
regexp/inc/regexp/reclass.hxx
solenv/gbuild/AllLangResTarget.mk
Change-Id: I398f0cd9e7daefa8d2e04fd977d5bc2e9708169b
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/rules.mk | 14 | ||||
| -rw-r--r-- | solenv/inc/tg_help.mk | 5 | ||||
| -rw-r--r-- | solenv/inc/unitools.mk | 1 |
3 files changed, 5 insertions, 15 deletions
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 526f8c0dda7e..02ed21d17ce6 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -697,17 +697,3 @@ $(COMMONMISC)/$(TARGET)/%.uulf : $$(@:b).ulf @$(COPY) $< $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ @-$(RM) $@.$(INPATH) - -# This is still needed????? -$(COMMONMISC)/$(TARGET)/%.xrm : %.xrm - $(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) - -# dirty hack -# if local *.sdf file is missing -#%.sdf: -# echo > $@ - diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk index c67e04ae1a1e..f87953ae5dfb 100644 --- a/solenv/inc/tg_help.mk +++ b/solenv/inc/tg_help.mk @@ -54,7 +54,10 @@ $(XHPDEST)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp $(HELP_OUT)$/$(TARGET).done : $(HLANGXHPFILES) .IF "$(WITH_LANG)"!="" @echo Localizing help files... - $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(HELPEX) -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(XHPDEST) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@ + @$(foreach,xhpfile,$(XHPFILES) cp $(SRC_ROOT)/$(PRJNAME)/source/$(SHELL_PACKAGE)/$(xhpfile) $(subst,$(PRJ),$(SRC_ROOT)/$(PRJNAME) $(XHPDEST))/en-US/$(SHELL_PACKAGE)/$(xhpfile) && ) \ + $(foreach,lang,$(subst,en-US, $(aux_alllangiso)) \ + $(AUGMENT_LIBRARY_PATH) $(HELPEX) -mi $(mktmp $(foreach,xhpfile,$(XHPFILES) $(SRC_ROOT)/$(PRJNAME)/source/$(SHELL_PACKAGE)/$(xhpfile))) -o $(subst,$(PRJ),$(SRC_ROOT)/$(PRJNAME) $(XHPDEST))/$(lang)/$(SHELL_PACKAGE) -m $(mktmp $(SRC_ROOT)/translations/source/$(lang)/$(PRJNAME)/source/$(SHELL_PACKAGE).po) -l $(lang) && )\ + $(TOUCH) $@ .ELSE # "$(WITH_LANG)"!="" @echo Copying help files... $(COMMAND_ECHO)cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(XHPDEST)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@ diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index 863c4ad23db6..bbd51bf325a1 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -33,6 +33,7 @@ CFGEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cfgex AUTODOC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/autodoc LOCALIZE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/localize GSICHECK*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/gsicheck +TREEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/treex .IF "$(XSLTPROC)"=="" .IF "$(SYSTEM_LIBXSLT)"!="YES" |