[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                        |    7 ++
 patches/dev300/scp2_accessories_templates_makefile-m58.diff |   42 ++++++++++++
 patches/dev300/scp2_accessories_templates_makefile.diff     |   18 ++---
 3 files changed, 58 insertions(+), 9 deletions(-)

New commits:
commit 8d555029ca463d5fa8112002e9518c49318ab764
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Oct 5 11:23:41 2009 +0300

    Split and adapt scp2_accessories_templates_makefile.diff for m58/60

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 981bc6b..ac7c720 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2769,7 +2769,14 @@ extensions_packinfo.diff
 # Originally, it was for OxygenOffice but the language depended Sun Templates Pack also require this changes
 premium-splitted-language-packages.diff
 scp2_accessories_templates.diff
+
+[ IntegrateExtensions >= dev300-m60 ]
 scp2_accessories_templates_makefile.diff
+
+[ IntegrateExtensions < dev300-m60 ]
+scp2_accessories_templates_makefile-m58.diff
+
+[ IntegrateExtensions ]
 extensions_deliver.diff
 
 [ OxygenOfficeDefaultSettings ]
diff --git a/patches/dev300/scp2_accessories_templates_makefile-m58.diff b/patches/dev300/scp2_accessories_templates_makefile-m58.diff
new file mode 100644
index 0000000..e7c0747
--- /dev/null
+++ b/patches/dev300/scp2_accessories_templates_makefile-m58.diff
@@ -0,0 +1,42 @@
+--- scp2/source/templates/makefile.mk
++++ scp2/source/templates/makefile.mk
+@@ -44,13 +44,38 @@
+ COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
+ .EXPORT : COMPLETELANGISO_VAR
+ 
+-ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc
++ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_accessories_templates_root.inc $(INCCOM)$/alllangmodules_accessories_samples_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc $(INCCOM)$/alllangmodules_extensions_root.inc $(INCCOM)$/alllangmodules_extensions_templates.inc
+ 
+ .INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
+ .IF "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
+ PHONYTEMPL=.PHONY
+ .ENDIF			# "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
+ $(INCCOM)$/alllangmodules%.inc $(PHONYTEMPL) : module_langpack%.sct
+ 	@@-$(RENAME) $@ $@.tmp
+ 	$(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
+ 	@echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_lang_track.mk
++
++.PHONY $(INCCOM)$/alllangmodules_accessories_templates_root.inc:
++	@@-$(RENAME) $@ $@.tmp
++	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_accessories_templates_root.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
++
++.PHONY $(INCCOM)$/alllangmodules_accessories_samples_root.inc:
++	@@-$(RENAME) $@ $@.tmp
++	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_accessories_samples_root.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
++
++.PHONY $(INCCOM)$/alllangmodules_accessories_templates.inc:
++	@@-$(RENAME) $@ $@.tmp
++	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_accessories_templates.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
++
++.PHONY $(INCCOM)$/alllangmodules_accessories_samples.inc:
++	@@-$(RENAME) $@ $@.tmp
++	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_accessories_samples.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
++
++.PHONY $(INCCOM)$/alllangmodules_extensions_root.inc:
++	@@-$(RENAME) $@ $@.tmp
++	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_extensions_root.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
++
++.PHONY $(INCCOM)$/alllangmodules_extensions_templates.inc:
++	@@-$(RENAME) $@ $@.tmp
++	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_extensions_templates.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
++
diff --git a/patches/dev300/scp2_accessories_templates_makefile.diff b/patches/dev300/scp2_accessories_templates_makefile.diff
index e7c0747..fa77b31 100644
--- a/patches/dev300/scp2_accessories_templates_makefile.diff
+++ b/patches/dev300/scp2_accessories_templates_makefile.diff
@@ -12,31 +12,31 @@
  PHONYTEMPL=.PHONY
  .ENDIF			# "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
  $(INCCOM)$/alllangmodules%.inc $(PHONYTEMPL) : module_langpack%.sct
- 	@@-$(RENAME) $@ $@.tmp
- 	$(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
- 	@echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_lang_track.mk
+     @@-$(RENAME) $@ $@.tmp
+ 	$(COMMAND_ECHO)$(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
+     @echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_lang_track.mk
 +
 +.PHONY $(INCCOM)$/alllangmodules_accessories_templates_root.inc:
 +	@@-$(RENAME) $@ $@.tmp
-+	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_accessories_templates_root.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
++	$(COMMAND_ECHO)$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_accessories_templates_root.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
 +
 +.PHONY $(INCCOM)$/alllangmodules_accessories_samples_root.inc:
 +	@@-$(RENAME) $@ $@.tmp
-+	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_accessories_samples_root.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
++	$(COMMAND_ECHO)$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_accessories_samples_root.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
 +
 +.PHONY $(INCCOM)$/alllangmodules_accessories_templates.inc:
 +	@@-$(RENAME) $@ $@.tmp
-+	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_accessories_templates.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
++	$(COMMAND_ECHO)$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_accessories_templates.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
 +
 +.PHONY $(INCCOM)$/alllangmodules_accessories_samples.inc:
 +	@@-$(RENAME) $@ $@.tmp
-+	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_accessories_samples.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
++	$(COMMAND_ECHO)$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_accessories_samples.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
 +
 +.PHONY $(INCCOM)$/alllangmodules_extensions_root.inc:
 +	@@-$(RENAME) $@ $@.tmp
-+	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_extensions_root.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
++	$(COMMAND_ECHO)$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_extensions_root.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
 +
 +.PHONY $(INCCOM)$/alllangmodules_extensions_templates.inc:
 +	@@-$(RENAME) $@ $@.tmp
-+	$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_extensions_templates.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
++	$(COMMAND_ECHO)$(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_extensions_templates.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
 +