[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/framework default_images/introabout desktop/prj desktop/zipintro instsetoo_native/util solenv/bin
Andre Fischer
af at apache.org
Thu Feb 27 02:07:34 PST 2014
default_images/framework/res/beta/backing-beta.png |binary
default_images/framework/res/beta/backing.png |binary
default_images/framework/res/beta/backing_hc.png |binary
default_images/framework/res/beta/backing_rtl_left-beta.png |binary
default_images/framework/res/beta/backing_rtl_left.png |binary
default_images/framework/res/beta/backing_rtl_left_hc.png |binary
default_images/introabout/beta/about.png |binary
default_images/introabout/beta/intro.png |binary
desktop/prj/d.lst | 2
desktop/zipintro/makefile.mk | 13 +
instsetoo_native/util/makefile.mk | 30 ++++
instsetoo_native/util/openoffice.lst | 60 ++++++++
solenv/bin/replace_in_zip.pl | 87 ++++++++++++
13 files changed, 191 insertions(+), 1 deletion(-)
New commits:
commit 44cca168c8a086cb779e1981c14bfccc318f5339
Author: Andre Fischer <af at apache.org>
Date: Thu Feb 27 09:53:06 2014 +0000
124311: Merge in revision 1572480 from AOO410: adding 'beta' to product names and images.
diff --git a/default_images/framework/res/beta/backing-beta.png b/default_images/framework/res/beta/backing-beta.png
new file mode 100755
index 0000000..4ff3f6d
Binary files /dev/null and b/default_images/framework/res/beta/backing-beta.png differ
diff --git a/default_images/framework/res/beta/backing.png b/default_images/framework/res/beta/backing.png
new file mode 100755
index 0000000..069dace
Binary files /dev/null and b/default_images/framework/res/beta/backing.png differ
diff --git a/default_images/framework/res/beta/backing_hc.png b/default_images/framework/res/beta/backing_hc.png
new file mode 100755
index 0000000..f9c2561
Binary files /dev/null and b/default_images/framework/res/beta/backing_hc.png differ
diff --git a/default_images/framework/res/beta/backing_rtl_left-beta.png b/default_images/framework/res/beta/backing_rtl_left-beta.png
new file mode 100755
index 0000000..d4d123b
Binary files /dev/null and b/default_images/framework/res/beta/backing_rtl_left-beta.png differ
diff --git a/default_images/framework/res/beta/backing_rtl_left.png b/default_images/framework/res/beta/backing_rtl_left.png
new file mode 100755
index 0000000..1bab1e7
Binary files /dev/null and b/default_images/framework/res/beta/backing_rtl_left.png differ
diff --git a/default_images/framework/res/beta/backing_rtl_left_hc.png b/default_images/framework/res/beta/backing_rtl_left_hc.png
new file mode 100755
index 0000000..696a0ca
Binary files /dev/null and b/default_images/framework/res/beta/backing_rtl_left_hc.png differ
diff --git a/default_images/introabout/beta/about.png b/default_images/introabout/beta/about.png
new file mode 100755
index 0000000..83f0b35
Binary files /dev/null and b/default_images/introabout/beta/about.png differ
diff --git a/default_images/introabout/beta/intro.png b/default_images/introabout/beta/intro.png
new file mode 100755
index 0000000..10f6d6c
Binary files /dev/null and b/default_images/introabout/beta/intro.png differ
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index 074f2c3..c37aea2 100644
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -116,10 +116,12 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms
mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_dev
mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_dev_nologo
mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_nologo
+mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_beta
..\%__SRC%\bin\intro\intro.zip %COMMON_DEST%\pck%_EXT%\intro.zip
..\%__SRC%\bin\dev\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_dev\intro.zip
..\%__SRC%\bin\dev_nologo\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_dev_nologo\intro.zip
..\%__SRC%\bin\nologo\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_nologo\intro.zip
+..\%__SRC%\bin\beta\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_beta\intro.zip
..\%__SRC%\bin\guiloader.exe %_DEST%\bin%_EXT%\testtool.exe
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index 2db5c49..9ff1751 100644
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -29,7 +29,7 @@ TARGET=zipintro
.INCLUDE : settings.mk
-DEFAULT_FLAVOURS=dev dev_nologo nologo intro
+DEFAULT_FLAVOURS=dev dev_nologo nologo intro beta
ZIP1LIST= \
$(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev$/introabout$/intro.png $(INTRO_BITMAPS)) \
@@ -47,6 +47,10 @@ ZIP4LIST= \
$(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/intro.png $(INTRO_BITMAPS)) \
$(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS)) \
$(MISC)$/$(RSCDEFIMG)$/introabout$/logo.png
+ZIP5LIST= \
+ $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/beta$/intro.png $(INTRO_BITMAPS)) \
+ $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/beta$/about.png $(ABOUT_BITMAPS)) \
+ $(MISC)$/$(RSCDEFIMG)$/introabout$/logo.png
ZIP1TARGET=dev_intro
ZIP1DEPS=$(ZIP1LIST)
@@ -60,6 +64,9 @@ ZIP3DEPS=$(ZIP3LIST)
ZIP4TARGET=intro_intro
ZIP4DEPS=$(ZIP4LIST)
+ZIP5TARGET=beta_intro
+ZIP5DEPS=$(ZIP5LIST)
+
.INCLUDE : target.mk
ALLTAR : $(foreach,i,$(DEFAULT_FLAVOURS) $(COMMONBIN)$/$i$/intro.zip)
@@ -85,6 +92,10 @@ $(COMMONBIN)$/intro$/intro.zip : $(COMMONBIN)$/intro_intro.zip
@@-$(MKDIR) $(@:d)
@$(COPY) $< $@
+$(COMMONBIN)$/beta$/intro.zip : $(COMMONBIN)$/beta_intro.zip
+ @@-$(MKDIR) $(@:d)
+ @$(COPY) $< $@
+
$(MISC)$/%.bmp : $(SOLARSRC)$/%.bmp
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 9a48aed..9ff42ba 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -25,6 +25,7 @@ TARGET=util
.INCLUDE: settings.mk
.INCLUDE: $(SOLARINCDIR)$/rtlbootstrap.mk
+.INCLUDE: $(SOLARENVINC)$/version.mk
# watch for the path delimiter
.IF "$(GUI)"=="WNT"
@@ -82,6 +83,7 @@ help .PHONY :
@echo " ooodevlanguagepack"
@echo " sdkoo"
@echo " sdkoodev"
+ @echo " openofficebeta like openoffice but with 'Beta' appended to product name"
@echo
@echo "experimental targets:"
@echo " patch-create create a patch for updating an installed office (Windows only)"
@@ -180,6 +182,7 @@ openoffice:
# Add dependencies of basic targets on language specific targets.
openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
+beta: $(foreach,i,$(alllangiso) beta_$i)
openofficewithjre: $(foreach,i,$(alllangiso) openofficewithjre_$i)
ooolanguagepack : $(foreach,i,$(alllangiso) ooolanguagepack_$i)
ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
@@ -193,6 +196,7 @@ MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates
NOLOGOSPLASH:=$(BIN)$/intro.zip
DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip
+BETA_LOGO_SPLASH:=$(BIN)$/beta$/intro.zip $(BIN)$/beta$/images.zip
MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates
MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates
MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
@@ -214,6 +218,7 @@ updatepack : local_python_files
$(foreach,i,$(alllangiso) openoffice_$i) : adddeps
openoffice_$(defaultlangiso).archive : adddeps
$(foreach,i,$(alllangiso) openofficedev_$i) : adddeps
+$(foreach,i,$(alllangiso) beta_$i) : adddeps $(BETA_LOGO_SPLASH)
$(foreach,i,$(alllangiso) openofficewithjre_$i) : adddeps
$(foreach,i,$(alllangiso) ooolanguagepack_$i) : adddeps
$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : adddeps
@@ -227,6 +232,7 @@ $(foreach,i,$(alllangiso) sdkoodev_$i) : adddeps
$(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
$(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(alllangiso) beta_$i) : $$@{$(PKGFORMAT:^".")}
$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
$(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
@@ -281,6 +287,15 @@ $(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) openofficedev_$L.$P)) .
$(PRJ)$/util$/update.xml \
> $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) beta_$L.$P)) .PHONY :
+ $(MAKE_INSTALLER_COMMAND) \
+ -p Apache_OpenOffice_Beta \
+ -msitemplate $(MSIOFFICETEMPLATEDIR)
+ $(GEN_UPDATE_INFO_COMMAND) \
+ --product Apache_OpenOffice_Beta \
+ $(PRJ)$/util$/update.xml \
+ > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+
#ooolanguagepack_%{$(PKGFORMAT:^".")} :
$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) ooolanguagepack_$L.$P)) .PHONY :
$(MAKE_INSTALLER_COMMAND) \
@@ -312,6 +327,21 @@ $(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_dev$/intro.zip
@-$(MKDIR) $(@:d)
$(COPY) $< $@
+$(BIN)$/beta$/intro.zip : $(SOLARCOMMONPCKDIR)$/openoffice_beta$/intro.zip
+ @-$(MKDIR) $(@:d)
+ $(COPY) $< $@
+
+# Replace framework/res/*.png with *-beta.png
+$(BIN)$/beta$/images.zip : $(SOLARSHAREDBIN)$/images.zip
+ $(COPY) $< $@
+ $(SOLARENV)$/bin/replace_in_zip.pl \
+ $@ \
+ framework/res/ \
+ $(SRC_ROOT)/default_images/framework/res/beta/ \
+ backing.png \
+ backing_hc.png \
+ backing_rtl_left.png \
+ backing_rtl_left_hc.png
.IF "$(OS)" == "WNT"
$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) patch-create_$L.$P)) .PHONY :
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 0d82994..82af5e7 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -340,3 +340,63 @@ Apache_OpenOffice_Dev_SDK
include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarenvpath}/{os}/MS
}
}
+
+Apache_OpenOffice_Beta
+{
+ Settings
+ {
+ variables
+ {
+ FULLPRODUCTNAME Apache OpenOffice Beta
+ PRODUCTNAME OpenOffice Beta
+ PRODUCTVERSION 4.1.0
+ PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION
+ BASISROOTNAME AOOBeta
+ BASISPACKAGEPREFIX aoobeta
+ UREPACKAGEPREFIX aoobeta
+ SOLSUREPACKAGEPREFIX aoobeta
+ POSTVERSIONEXTENSION
+ BRANDPACKAGEVERSION 4
+ USERDIRPRODUCTVERSION 4
+ ABOUTBOXPRODUCTVERSION 4.1.0
+ BASEPRODUCTVERSION 4.1
+ UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
+ REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
+ ADDSYSTEMINTEGRATION 0
+ EVAL
+ PACKAGEVERSION 4.1.0
+ PACKAGEREVISION {milestone}
+ LICENSENAME ALv2
+ GLOBALFILEGID gid_File_Lib_Vcl
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ SETSTATICPATH 1
+ AOODOWNLOADNAME 1
+ AOODOWNLOADNAMEPREFIX Apache_OpenOffice_Beta
+ XPDINSTALLER 0
+ BETAUPGRADECODE
+ STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+ CHANGETARGETDIR 1
+ USE_FILEVERSION 1
+ LIBRARYVERSION 10.0.0
+ PATCHCODEFILE ooo_patchcodes.txt
+ DOWNLOADBANNER ooobanner.bmp
+ DOWNLOADBITMAP ooobitmap.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ RELATIVE_PATHES_IN_DDF 1
+ STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
+ STARTCENTER_INFO_URL http://www.openoffice.org
+ STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
+ STARTCENTER_LAYOUT_STYLE 0
+ DICT_REPO_URL http://extensions.openoffice.org/dictionaries
+ }
+ active 1
+ compression 5
+ script setup_osl
+ downloadname Apache_OpenOffice_Beta_{productversion}_{os}_install_{languages}
+ langpackdownloadname Apache_OpenOffice_Beta_{productversion}_languagepack_{os}_install_{languages}
+ include {solarenvpath}/{os}/loader2,.,{localpath}/bin/beta,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+ }
+}
diff --git a/solenv/bin/replace_in_zip.pl b/solenv/bin/replace_in_zip.pl
new file mode 100644
index 0000000..c77bbfc
--- /dev/null
+++ b/solenv/bin/replace_in_zip.pl
@@ -0,0 +1,87 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+#!/usr/bin/perl
+
+use Archive::Zip;
+
+use strict;
+use warnings;
+
+=head NAME
+
+ replace_in_zip.pl - Replace a file in a zip file with another file on disk.
+
+=head SYNOPSIS
+
+ replace_in_zip.pl <zip-file> <zip-entry-path> <replacement-path> <image-name>+
+
+=cut
+
+
+sub main (@)
+{
+ my ($zip_filename, $entry_path, $replacement_path, @image_names) = @_;
+
+ if (scalar @image_names == 0)
+ {
+ die "usage: replace_in_zip.pl <zip-file> <zip-entry-path> <replacement-path> <image-name>+";
+ }
+
+ # Open the archive.
+ my $zip = Archive::Zip->new();
+ if ( ! -f $zip_filename || $zip->read($zip_filename) != Archive::Zip::AZ_OK)
+ {
+ die "can not open zip file $zip_filename";
+ }
+
+ $entry_path .= "/" unless $entry_path =~ /\/$/;
+ $replacement_path .= "/" unless $replacement_path =~ /\/$/;
+
+ foreach my $image_basename (@image_names)
+ {
+ printf "replacing %s\n", $image_basename;
+
+ # Get access to the entry.
+ my $entry_name = $entry_path . $image_basename;
+ my $member = $zip->memberNamed($entry_name);
+ die "can not access entry $entry_name" unless defined $member;
+
+ # Check the replacement file.
+ my $replacement_filename = $replacement_path . $image_basename;
+ die "can not read the replacement $replacement_filename"
+ unless -f $replacement_filename;
+
+ # Make the replacement.
+ $zip->removeMember($member);
+ my $new_member = $zip->addFile($replacement_filename, $entry_name);
+ die "replacing failed" unless defined $new_member;
+ }
+
+ # Write zip back to file.
+ printf "writing archive back to disk\n";
+ if ($zip->overwrite() != Archive::Zip::AZ_OK)
+ {
+ die "writing zip back to disk failed";
+ }
+}
+
+main(@ARGV);
More information about the Libreoffice-commits
mailing list