applied_patches/0408-layout-parallel-build.diff

   1 --- solenv/inc/layout.mk
   2 +++ solenv/inc/layout.mk
   3 @@ -1,32 +1,29 @@ TRALAY=tralay
   4 -TRALAY=$(AUGMENT_LIBRARY_PATH) tralay
   5 +TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/tralay
   6  XML_DEST=$(DLLDEST)
   7  XML_LANGS=$(alllangiso)
   8
   9 -ALL_XMLS=$(foreach,i,$(XML_FILES) "$(XML_DEST)/$i") $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) "$(XML_DEST)/$i/$j"))
  10 +ALL_XMLS=$(foreach,i,$(XML_FILES) $(XML_DEST)$/$i) $(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) $(XML_DEST)$/$i$/$j))
  11 +XML_DEPS=$(foreach,i,$(XML_FILES) $(MISC)$/$i.dep)
  12
  13  # Must remove the -j (no duplicate base file names) flag
  14  ZIPUPDATE=-u
  15  XML_ZIP = $(PRJNAME)-layout
  16
  17 -ALLTAR: localize.sdf $(XML_ZIP)
  18 -
  19 -$(XML_ZIP): $(ALL_XMLS)
  20 +ALLTAR .SEQUENTIAL: localize.sdf ALL_XML_DEPS
  21 +
  22 +ALL_XML_DEPS: $(XML_DEPS)
  23
  24  ZIP1DIR=$(XML_DEST)
  25  ZIP1TARGET=$(XML_ZIP)
  26  ZIP1LIST=$(ALL_XMLS:s@$(XML_DEST)/@@)
  27 +ZIP1DEPS=localize.sdf $(XML_DEPS)
  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