summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Noack <christoph@dogmatux.com>2011-01-10 11:30:01 +0000
committerMichael Meeks <michael.meeks@novell.com>2011-01-10 11:30:34 +0000
commit50319c1ed7e7ceb19d9be60a6aef6a441eb2e918 (patch)
tree2d61038e287d4584049006cccaa44c196cb5b314
parentcceeee5fc714d45741492513ad31bb16dae190f8 (diff)
add de-branded MSI installation artwork, bug#32435
-rw-r--r--instsetoo_native/res/nologobanner.bmpbin0 -> 5910 bytes
-rw-r--r--instsetoo_native/res/nologoinstall.bmpbin52242 -> 52030 bytes
-rw-r--r--instsetoo_native/util/makefile.mk12
3 files changed, 11 insertions, 1 deletions
diff --git a/instsetoo_native/res/nologobanner.bmp b/instsetoo_native/res/nologobanner.bmp
new file mode 100644
index 000000000..726be7514
--- /dev/null
+++ b/instsetoo_native/res/nologobanner.bmp
Binary files differ
diff --git a/instsetoo_native/res/nologoinstall.bmp b/instsetoo_native/res/nologoinstall.bmp
index 25b5b11be..8af9fc41f 100644
--- a/instsetoo_native/res/nologoinstall.bmp
+++ b/instsetoo_native/res/nologoinstall.bmp
Binary files differ
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 31630d5ef..2befb3e81 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -191,7 +191,7 @@ $(foreach,i,$(alllangiso) ooodevhelppack_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
-
+
$(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) broffice_$i) : $(ADDDEPS)
@@ -341,11 +341,21 @@ hack_msitemplates .PHONY:
$(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp
$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+ $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
+ $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
+ $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
+ $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
+ $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp
$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+ $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
+ $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
+ $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
+ $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
+ $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
.IF "$(OS)" == "WNT"