applied_patches/0651-layout-parallel-build.diff

   1 --- solenv/inc/layout.mk        2009-04-06 17:12:29.000000000 +0200
   2 +++ solenv/inc/layout.mk        2009-04-06 21:26:53.000000000 +0200
   3 @@ -2,33 +2,28 @@ TRALAY=tralay
   4  XML_DEST=$(DLLDEST)
   5  XML_LANGS=$(alllangiso)
   6
   7 -ALL_XMLS=$(foreach,i,$(XML_FILES) "$(XML_DEST)/$i") $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) "$(XML_DEST)/$i/$j"))
   8 +ALL_XMLS=$(foreach,i,$(XML_FILES) $(XML_DEST)$/$i) $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) $(XML_DEST)$/$i$/$j))
   9 +XML_DEPS=$(foreach,i,$(XML_FILES) $(MISC)$/$i.dep)
  10
  11  # Must remove the -j (no duplicate base file names) flag
  12  ZIPUPDATE=-u
  13  XML_ZIP = $(PRJNAME)-layout
  14
  15 -ALLTAR: localize.sdf $(XML_ZIP)
  16 -
  17 -$(XML_ZIP): $(ALL_XMLS)
  18 +ALLTAR .SEQUENTIAL: localize.sdf ALL_XML_DEPS
  19 +
  20 +ALL_XML_DEPS: $(XML_DEPS)
  21
  22  ZIP1DIR=$(XML_DEST)
  23  ZIP1TARGET=$(XML_ZIP)
  24  ZIP1LIST=$(ALL_XMLS:s@$(XML_DEST)/@@)
  25 +ZIP1DEPS=localize.sdf $(XML_DEPS)
  26
  27 -%.xml:  localize.sdf
  28 -
  29 -$(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
  30 -       -$(MKDIR) $(@:d)
  31 -       @echo $(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
  32 +$(MISC)$/%.xml.dep: %.xml
  33 +       -$(MKDIR) "$(XML_DEST)"
  34 +       cp "$<" "$(XML_DEST)"
  35         $(TRALAY) -m localize.sdf -o "$(XML_DEST)" -l $(XML_LANGS:f:t" -l ") "$<"
  36 -
  37 -$(XML_DEST)/%.xml: %.xml
  38 -       -$(MKDIR) $(@:d)
  39 -       $(COPY) "$<" "$@"
  40 +       $(TOUCH) "$@"
  41
  42  # Don't want to overwrite filled localize.sdf with empty template
  43  template.sdf:
  44         $(foreach,i,$(XML_FILES) $(TRALAY) -l en-US "$i") > $@
  45 -
  46 -$(ZIP1LIST): localize.sdf