Hi Lovers of LibreOffice! I would like to introduce OxygenOffice as a product. Here is a first patches. I hope It can get into libreoffice-3-3 and libreoffice-3-3-2. First patch introduces the product second one patch some related patches in dev300 folder. Maybe we could integrate these two patches in dev300 into git. Please review it! Thank you in advance! Best regards, KAMI
From 15338cd7a1d741c68002507498437bd972243f77 Mon Sep 17 00:00:00 2001
From: Kalman Szalai - KAMI <kami911@gmail.com>
Date: Mon, 7 Mar 2011 07:14:00 +0100
Subject: [PATCH] Introduce OxygenOffice as a product
---
instsetoo_native/util/makefile.mk | 41 ++++++++++-
instsetoo_native/util/openoffice.lst | 139 ++++++++++++++++++++++++++++++++++
2 files changed, 179 insertions(+), 1 deletions(-)
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 2388d31..02dd229 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -147,6 +147,14 @@ brofficewithjre: $(foreach,i,$(alllangiso) brofficewithjre_$i)
broolanguagepack : $(foreach,i,$(alllangiso) broolanguagepack_$i)
+oxygenoffice: $(foreach,i,$(alllangiso) oxygenoffice_$i)
+
+oxygenofficewithjre: $(foreach,i,$(alllangiso) oxygenofficewithjre_$i)
+
+oxygenofficelanguagepack : $(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i)
+
+oxygenofficehelppack : $(foreach,i,$(alllangiso) oxygenofficehelppack_$i)
+
MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates
MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
MSIHELPPACKTEMPLATESOURCE=$(PRJ)$/inc_ooohelppack$/windows$/msi_templates
@@ -202,6 +210,14 @@ $(foreach,i,$(alllangiso) brofficewithjre_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) broolanguagepack_$i) : $(ADDDEPS)
+$(foreach,i,$(alllangiso) oxygenoffice_$i) : $(ADDDEPS)
+
+$(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $(ADDDEPS)
+
+$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $(ADDDEPS)
+
+$(foreach,i,$(alllangiso) oxygenofficehelppack_$i) : $(ADDDEPS)
+
.IF "$(MAKETARGETS)"!=""
$(MAKETARGETS) : $(ADDDEPS)
.ENDIF # "$(MAKETARGETS)"!=""
@@ -287,6 +303,29 @@ $(foreach,i,$(alllangiso) broolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
broolanguagepack_%{$(PKGFORMAT:^".")} :
+$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l
$(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format
$(@:e:s/.//) $(VERBOSESWITCH)
+$(foreach,i,$(alllangiso) oxygenoffice_$i) : $$@{$(PKGFORMAT:^".")}
+.IF "$(MAKETARGETS)"!=""
+.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
+$(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
+$(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
+.ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
+.ENDIF # "$(MAKETARGETS)"!=""
+oxygenoffice_%{$(PKGFORMAT:^".") .archive} :
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l
$(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//)
$(VERBOSESWITCH)
+ $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os
"$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OxygenOffice --languages
$(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date
+%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+
+$(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
+oxygenofficewithjre_%{$(PKGFORMAT:^".")} :
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l
$(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//)
$(VERBOSESWITCH)
+
+$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
+ooolanguagepack_%{$(PKGFORMAT:^".")} :
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l
$(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format
$(@:e:s/.//) $(VERBOSESWITCH)
+
+$(foreach,i,$(alllangiso) oxygenofficehelppack_$i) : $$@{$(PKGFORMAT:^".")}
+ooohelppack_%{$(PKGFORMAT:^".")} :
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l
$(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//)
$(VERBOSESWITCH)
+
.ELSE # "$(alllangiso)"!=""
openoffice:
@echo cannot pack nothing...
@@ -294,7 +333,7 @@ openoffice:
.ENDIF # "$(alllangiso)"!=""
.IF "$(LOCALPYFILES)"!=""
-$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive}
openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")}
broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")}
brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
+$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive}
openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")}
broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")}
brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".")
.archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
.ENDIF # "$(LOCALPYFILES)"!=""
$(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index c70448f..23d7370 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -395,3 +395,142 @@ LibreOffice_Dev_SDK
include
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarcommonpath}/bin.{minor},{solarenvpath}/{os}/MS
}
}
+
+OxygenOffice
+{
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME OxygenOffice
+ PRODUCTNAME_BR OxygenOffice
+ PRODUCTVERSION 3.3
+ PRODUCTEXTENSION
+ LONG_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION beta1
+ POSTVERSIONEXTENSION
+ POSTVERSIONEXTENSIONUNIX
+ BRANDPACKAGEVERSION 3
+ USERDIRPRODUCTVERSION 3
+ ABOUTBOXPRODUCTVERSION 3.3.2
+ BASEPRODUCTVERSION 3.3
+ PCPFILENAME openoffice.pcp
+ UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+ ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
+ ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
+ REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
+ ADDSYSTEMINTEGRATION 1
+ EVAL
+ FILEFORMATNAME OpenOffice.org
+ FILEFORMATVERSION 1.0
+ WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
+ PACKAGEVERSION 3.3.2
+ PACKAGEREVISION {milestone}
+ LICENSENAME LGPL
+ SERVICESPROJEKT 1
+ GLOBALFILEGID gid_File_Lib_Vcl
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ OPENSOURCE 1
+ SETSTATICPATH 1
+ OOODOWNLOADNAME 1
+ XPDINSTALLER 0
+ BETAUPGRADECODE
+ STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+ CHANGETARGETDIR 1
+ USE_FILEVERSION 1
+ LIBRARYVERSION 9.3.0
+ PATCHCODEFILE ooo_patchcodes.txt
+ DOWNLOADBANNER ooobanner_ooop.bmp
+ DOWNLOADBITMAP ooobitmap_ooop.bmp
+ DOWNLOADBANNER_BR ooobanner_ooop.bmp
+ DOWNLOADBITMAP_BR ooobitmap_ooop.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ RELATIVE_PATHES_IN_DDF 1
+ STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+ STARTCENTER_INFO_URL http://www.libreoffice.org/
+ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
+ STARTCENTER_LAYOUT_STYLE 0
+ REGISTRATION_PRODUCT OxygenOffice
+ REGISTRATION_CID 926117
+ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
+ }
+ active 1
+ compression 5
+ script setup_osl
+ downloadname OOOP_{productversion}_{os}_install_{languages}
+ langpackdownloadname OOOP_{productversion}_languagepack_{os}_install_{languages}
+ helppackdownloadname OOOP_{productversion}_helppack_{os}_install_{languages}
+ include
{solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{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},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
+ }
+}
+
+OxygenOffice_wJRE
+{
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME OxygenOffice
+ PRODUCTNAME_BR OxygenOffice
+ PRODUCTVERSION 3.3
+ PRODUCTEXTENSION
+ LONG_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION beta1
+ POSTVERSIONEXTENSION
+ POSTVERSIONEXTENSIONUNIX
+ BRANDPACKAGEVERSION 3
+ USERDIRPRODUCTVERSION 3
+ ABOUTBOXPRODUCTVERSION 3.3.2
+ BASEPRODUCTVERSION 3.3
+ UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
+ ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
+ ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
+ REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
+ ADDSYSTEMINTEGRATION 1
+ EVAL
+ FILEFORMATNAME OpenOffice.org
+ FILEFORMATVERSION 1.0
+ WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
+ PACKAGEVERSION 3.3.2
+ PACKAGEREVISION {milestone}
+ LICENSENAME LGPL
+ SERVICESPROJEKT 1
+ WITHJREPRODUCT 1
+ GLOBALFILEGID gid_File_Lib_Vcl
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ OPENSOURCE 1
+ SETSTATICPATH 1
+ OOODOWNLOADNAME 1
+ XPDINSTALLER 1
+ BETAUPGRADECODE
+ STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+ CHANGETARGETDIR 1
+ USE_FILEVERSION 1
+ LIBRARYVERSION 9.3.0
+ PATCHCODEFILE ooo_patchcodes.txt
+ JAVAPRODUCT 1
+ DOWNLOADBANNER ooobanner_ooop.bmp
+ DOWNLOADBITMAP ooobitmap_ooop.bmp
+ DOWNLOADBANNER_BR ooobanner_ooop.bmp
+ DOWNLOADBITMAP_BR ooobitmap_ooop.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ RELATIVE_PATHES_IN_DDF 1
+ STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+ STARTCENTER_INFO_URL http://www.libreoffice.org/
+ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
+ STARTCENTER_LAYOUT_STYLE 0
+ REGISTRATION_PRODUCT OxygenOffice
+ REGISTRATION_CID 926117
+ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
+ }
+ active 1
+ compression 5
+ script setup_osljre
+ downloadname OOOP_{productversion}_{os}_installwjre_{languages}
+ langpackdownloadname
OOOP_{productversion}_languagepack_{os}_installwjre_{languages}
+ helppackdownloadname OOOP_{productversion}_helppack_{os}_installwjre_{languages}
+ include
{solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{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},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
+ }
+}
--
1.7.1
From 78c03ba2aa7d363db575bdad94f4b7af53920837 Mon Sep 17 00:00:00 2001
From: Kalman Szalai - KAMI <kami911@gmail.com>
Date: Mon, 7 Mar 2011 07:24:08 +0100
Subject: [PATCH] Fix buildfix patches - OxygenOffice introduction
---
.../dev300/buildfix-instsetoo_native-archive.diff | 2 +-
.../buildfix-instsetoo_native-no-PKGFORMAT.diff | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/patches/dev300/buildfix-instsetoo_native-archive.diff
b/patches/dev300/buildfix-instsetoo_native-archive.diff
index 95f67a7..61e9155 100644
--- a/patches/dev300/buildfix-instsetoo_native-archive.diff
+++ b/patches/dev300/buildfix-instsetoo_native-archive.diff
@@ -75,4 +75,4 @@
+broolanguagepack_%{$(PKGFORMAT:^".") .archive} :
+$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l
$(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format
$(@:e:s/.//) $(VERBOSESWITCH)
- .ELSE # "$(alllangiso)"!=""
+ $(foreach,i,$(alllangiso) oxygenoffice_$i) : $$@{$(PKGFORMAT:^".")}
diff --git a/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff
b/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff
index 466d8a0..0cdc4fd 100644
--- a/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff
+++ b/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff
@@ -16,4 +16,4 @@ diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.
+.ENDIF
.IF "$(LOCALPYFILES)"!=""
- $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive}
openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")}
broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")}
brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
+ $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive}
openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")}
broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")}
brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".")
.archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
--
1.7.1
Attachment:
signature.asc
Description: OpenPGP digital signature