diff options
author | Andras Timar <andras.timar@collabora.com> | 2015-10-08 10:43:12 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2021-03-30 16:33:37 +0200 |
commit | 39bd6dc199df3757b0e7b7f19772bb4410c8fa78 (patch) | |
tree | d43d81cb46a9fa77d380f9f744d278d982d3f20a /instsetoo_native | |
parent | [cp] ERROR ITMS-90511: CFBundleIdentifier Collision (diff) | |
download | core-39bd6dc199df3757b0e7b7f19772bb4410c8fa78.tar.gz core-39bd6dc199df3757b0e7b7f19772bb4410c8fa78.zip |
[cp] Collabora Office branding
Change-Id: I9e79c07aa3cbb70076d9bab07294062df4be02c6
Diffstat (limited to 'instsetoo_native')
-rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 14 | ||||
-rw-r--r-- | instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp | bin | 37170 -> 108126 bytes | |||
-rw-r--r-- | instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp | bin | 52246 -> 152310 bytes | |||
-rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 33 |
4 files changed, 24 insertions, 23 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 6feb5238664b..e8c928d96fff 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -41,7 +41,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'InstallMode=<installmode>' \ && echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \ $(if $(ENABLE_RELEASE_BUILD),\ - && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out HAIKU MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \ + && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out HAIKU MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]" | tr -d " "),$(shell echo $(PRODUCTNAME) | tr -d " "))/4', \ && echo 'UserInstallation=$$ORIGIN/..') \ ) > $@ $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) @@ -137,12 +137,12 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'NativeProgress=false' \ && echo 'ProgressBarColor=0,0,0' \ && echo 'ProgressFrameColor=102,102,102' \ - && echo 'ProgressPosition=30,145' \ - && echo 'ProgressSize=385,8' \ - && echo 'ProgressPositionHigh=30,200' \ - && echo 'ProgressSizeHigh=650,12' \ - && echo 'ProgressTextBaseline=170' \ - && echo 'ProgressTextColor=0,0,0' \ + && echo 'ProgressPosition=26,235' \ + && echo 'ProgressSize=460,6' \ + && echo 'ProgressPositionHigh=46,212' \ + && echo 'ProgressSizeHigh=617,12' \ + && echo 'ProgressTextBaseline=230' \ + && echo 'ProgressTextColor=255,255,255' \ && echo 'SecureUserConfig=true' \ && echo 'SecureUserConfigCompress=true' \ && echo 'SecureUserConfigExtensions=true' \ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp Binary files differindex b9cfdb9eab8b..5f8be18fd7a0 100644 --- a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp Binary files differindex d5e8e047bad4..0fc8f7fb6c72 100644 --- a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 44ea727aa3ba..7ae52f3fa931 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -8,21 +8,21 @@ Globals UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_PATCH@ URELAYERVERSION 1 REFERENCEOOOMAJORMINOR 4.1 - WINDOWSBASISROOTNAME LibreOffice - UNIXBASISROOTNAME libreoffice@LIBO_VERSION_MAJOR@ + WINDOWSBASISROOTNAME Collabora Office + UNIXBASISROOTNAME collaboraoffice@LIBO_VERSION_MAJOR@ HIDELICENSEDIALOG 0 PACKAGEPREFIX - BASISPACKAGEPREFIX libobasis - UREPACKAGEPREFIX libreoffice + BASISPACKAGEPREFIX collaboraofficebasis + UREPACKAGEPREFIX collaboraoffice SOLSUREPACKAGEPREFIX libreoffice PROGRESSBARCOLOR 0,0,0 + PROGRESSSIZE 460,6 + PROGRESSSIZEHIGH 617,12 + PROGRESSPOSITION 26,235 + PROGRESSPOSITIONHIGH 46,212 PROGRESSFRAMECOLOR 102,102,102 - PROGRESSPOSITION 30,145 - PROGRESSSIZE 385,8 - PROGRESSPOSITIONHIGH 30,200 - PROGRESSSIZEHIGH 650,12 - PROGRESSTEXTBASELINE 170 - PROGRESSTEXTCOLOR 0,0,0 + PROGRESSTEXTBASELINE 230 + PROGRESSTEXTCOLOR 255,255,255 NATIVEPROGRESS false REGISTRYLAYERNAME Layers SERVICEPACK 1 @@ -31,6 +31,7 @@ Globals UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@ + OOOVENDOR Collabora Productivity Ltd. 64BITPRODUCT @WINDOWS_X64@ WINDOWSSDKVERSION @WINDOWS_SDK_VERSION@ CRASHDUMPENABLE @DEFAULT_CRASHDUMP_VALUE@ @@ -38,13 +39,13 @@ Globals } } -LibreOffice +CollaboraOffice { Settings { variables { - PRODUCTNAME @PRODUCTNAME@ + PRODUCTNAME Collabora Office PRODUCTVERSION @LIBO_VERSION_MAJOR@ PRODUCTEXTENSION -@LIBO_VERSION_PATCH@ POSTVERSIONEXTENSION @@ -67,15 +68,15 @@ LibreOffice CHANGETARGETDIR 1 PATCHCODEFILE ooo_patchcodes.txt STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/ - STARTCENTER_INFO_URL https://www.libreoffice.org/ + STARTCENTER_INFO_URL https://collaboraoffice.com/ STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/ } active 1 compression 5 script setup_osl - downloadname LibreOffice_{productversion}_{os}_install_{languages} - langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages} - helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages} + downloadname CollaboraOffice_{productversion}_{os}_install_{languages} + langpackdownloadname CollaboraOffice_{productversion}_languagepack_{os}_install_{languages} + helppackdownloadname CollaboraOffice_{productversion}_helppack_{os}_install_{languages} include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath} } } |