Author: pfg
Date: Tue Nov 29 15:34:52 2011
New Revision: 1207925
URL: http://svn.apache.org/viewvc?rev=1207925&view=rev
Log:
Drop BrOffice brand, we will be using the Apache trademark in Brazil too.
Removed:
incubator/ooo/trunk/main/instsetoo_native/inc_broffice/
incubator/ooo/trunk/main/ooo_custom_images/broffice/
incubator/ooo/trunk/main/ooo_custom_images/dev_broffice/
incubator/ooo/trunk/main/ooo_custom_images/dev_nologo_broffice/
Modified:
incubator/ooo/trunk/main/desktop/prj/d.lst
incubator/ooo/trunk/main/desktop/zipintro/makefile.mk
incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk
incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst
incubator/ooo/trunk/main/instsetoo_native/util/pack.lst
incubator/ooo/trunk/main/setup_native/prj/d.lst
incubator/ooo/trunk/main/solenv/bin/modules/installer/download.pm
incubator/ooo/trunk/main/sysui/desktop/productversion.mk
incubator/ooo/trunk/main/testautomation/global/input/officeinfo.txt
Modified: incubator/ooo/trunk/main/desktop/prj/d.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/prj/d.lst?rev=1207925&r1=1207924&r2=1207925&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/prj/d.lst (original)
+++ incubator/ooo/trunk/main/desktop/prj/d.lst Tue Nov 29 15:34:52 2011
@@ -113,18 +113,10 @@ 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%\broffice_dev
-mkdir: %COMMON_DEST%\pck%_EXT%\broffice
-mkdir: %COMMON_DEST%\pck%_EXT%\broffice_dev_nologo
-mkdir: %COMMON_DEST%\pck%_EXT%\broffice_nologo
..\%__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\dev_broffice\intro.zip
%COMMON_DEST%\pck%_EXT%\broffice_dev\intro.zip
-..\%__SRC%\bin\broffice\intro.zip %COMMON_DEST%\pck%_EXT%\broffice\intro.zip
-..\%__SRC%\bin\nologo_dev_broffice\intro.zip
%COMMON_DEST%\pck%_EXT%\broffice_dev_nologo\intro.zip
-..\%__SRC%\bin\nologo_broffice\intro.zip
%COMMON_DEST%\pck%_EXT%\broffice_nologo\intro.zip
..\%__SRC%\bin\guiloader.exe %_DEST%\bin%_EXT%\testtool.exe
Modified: incubator/ooo/trunk/main/desktop/zipintro/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/zipintro/makefile.mk?rev=1207925&r1=1207924&r2=1207925&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/zipintro/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/zipintro/makefile.mk Tue Nov 29 15:34:52
2011
@@ -33,7 +33,7 @@ TARGET=zipintro
.INCLUDE : settings.mk
-DEFAULT_FLAVOURS=dev dev_nologo nologo broffice dev_broffice nologo_broffice
nologo_dev_broffice intro
+DEFAULT_FLAVOURS=dev dev_nologo nologo intro
ZIP1LIST= \
$(null,$(INTRO_BITMAPS)
$(MISC)$/ooo_custom_images$/dev$/introabout$/intro.png $(INTRO_BITMAPS)) \
@@ -47,18 +47,6 @@ ZIP3LIST= \
ZIP4LIST= \
$(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/intro.png
$(INTRO_BITMAPS)) \
$(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png
$(ABOUT_BITMAPS))
-ZIP5LIST= \
- $(null,$(INTRO_BITMAPS)
$(MISC)$/ooo_custom_images$/dev_broffice$/introabout$/intro.png
$(INTRO_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS)
$(MISC)$/ooo_custom_images$/broffice$/introabout$/about.png $(ABOUT_BITMAPS))
-ZIP6LIST= \
- $(null,$(INTRO_BITMAPS)
$(MISC)$/ooo_custom_images$/broffice$/introabout$/intro.png $(INTRO_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS)
$(MISC)$/ooo_custom_images$/broffice$/introabout$/about.png $(ABOUT_BITMAPS))
-ZIP7LIST= \
- $(null,$(INTRO_BITMAPS)
$(MISC)$/ooo_custom_images$/nologo_broffice$/introabout$/intro.png
$(INTRO_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS)
$(MISC)$/ooo_custom_images$/broffice$/introabout$/about.png $(ABOUT_BITMAPS))
-ZIP8LIST= \
- $(null,$(INTRO_BITMAPS)
$(MISC)$/ooo_custom_images$/dev_nologo_broffice$/introabout$/intro.png
$(INTRO_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS)
$(MISC)$/ooo_custom_images$/broffice$/introabout$/about.png $(ABOUT_BITMAPS))
ZIP1TARGET=dev_intro
ZIP1DEPS=$(ZIP1LIST)
@@ -72,18 +60,6 @@ ZIP3DEPS=$(ZIP3LIST)
ZIP4TARGET=intro_intro
ZIP4DEPS=$(ZIP4LIST)
-ZIP5TARGET=dev_broffice_intro
-ZIP5DEPS=$(ZIP5LIST)
-
-ZIP6TARGET=broffice_intro
-ZIP6DEPS=$(ZIP6LIST)
-
-ZIP7TARGET=nologo_broffice_intro
-ZIP7DEPS=$(ZIP7LIST)
-
-ZIP8TARGET=nologo_dev_broffice_intro
-ZIP8DEPS=$(ZIP8LIST)
-
.INCLUDE : target.mk
ALLTAR : $(foreach,i,$(DEFAULT_FLAVOURS) $(COMMONBIN)$/$i$/intro.zip)
@@ -105,22 +81,6 @@ $(COMMONBIN)$/nologo$/intro.zip : $(COMM
@@-$(MKDIR) $(@:d)
@$(COPY) $< $@
-$(COMMONBIN)$/broffice$/intro.zip : $(COMMONBIN)$/broffice_intro.zip
- @@-$(MKDIR) $(@:d)
- @$(COPY) $< $@
-
-$(COMMONBIN)$/dev_broffice$/intro.zip : $(COMMONBIN)$/dev_broffice_intro.zip
- @@-$(MKDIR) $(@:d)
- @$(COPY) $< $@
-
-$(COMMONBIN)$/nologo_broffice$/intro.zip :
$(COMMONBIN)$/nologo_broffice_intro.zip
- @@-$(MKDIR) $(@:d)
- @$(COPY) $< $@
-
-$(COMMONBIN)$/nologo_dev_broffice$/intro.zip :
$(COMMONBIN)$/nologo_dev_broffice_intro.zip
- @@-$(MKDIR) $(@:d)
- @$(COPY) $< $@
-
$(COMMONBIN)$/intro$/intro.zip : $(COMMONBIN)$/intro_intro.zip
@@-$(MKDIR) $(@:d)
@$(COPY) $< $@
Modified: incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk?rev=1207925&r1=1207924&r2=1207925&view=diff
==============================================================================
--- incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk Tue Nov 29
15:34:52 2011
@@ -134,14 +134,6 @@ sdkoodev: $(foreach,i,$(alllangiso) sdko
ure: $(foreach,i,$(alllangiso) ure_$i)
-broffice: $(foreach,i,$(alllangiso) broffice_$i)
-
-brofficedev: $(foreach,i,$(alllangiso) brofficedev_$i)
-
-brofficewithjre: $(foreach,i,$(alllangiso) brofficewithjre_$i)
-
-broolanguagepack : $(foreach,i,$(alllangiso) broolanguagepack_$i)
-
MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates
MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates
@@ -155,17 +147,13 @@ MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESO
.ELSE # "$(BUILD_SPECIAL)"!=""
NOLOGOSPLASH:=$(BIN)$/intro.zip
DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip
-BROFFICENOLOGOSPLASH:=$(BIN)$/broffice$/intro.zip
-BROFFICENOLOGOBRAND:=$(BIN)$/broffice$/images_brand.zip
-BROFFICEDEVNOLOGOSPLASH:=$(BIN)$/broffice_dev$/intro.zip
-BROFFICENDEVOLOGOBRAND:=$(BIN)$/broffice_dev$/images_brand.zip
MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates
MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates
MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates
MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
-ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH) $(BROFFICENOLOGOSPLASH)
$(BROFFICEDEVNOLOGOSPLASH) \
- $(BROFFICENOLOGOBRAND) $(BROFFICEDEVNOLOGOBRAND)
+ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
+
.IF "$(OS)" == "WNT"
ADDDEPS+=hack_msitemplates
.ENDIF
@@ -187,14 +175,6 @@ $(foreach,i,$(alllangiso) sdkoodev_$i) :
$(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
-$(foreach,i,$(alllangiso) broffice_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) brofficedev_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) brofficewithjre_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) broolanguagepack_$i) : $(ADDDEPS)
-
.IF "$(MAKETARGETS)"!=""
$(MAKETARGETS) : $(ADDDEPS)
.ENDIF # "$(MAKETARGETS)"!=""
@@ -248,29 +228,13 @@ ure_%{$(PKGFORMAT:^".")} :
-msilanguage $(MISC)$/win_ulffiles
.ENDIF
-$(foreach,i,$(alllangiso) broffice_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(alllangiso)) : $$@{$(PKGFORMAT:^".")}
.IF "$(MAKETARGETS)"!=""
.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
$(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
$(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
.ENDIF # "$(MAKETARGETS:e)"=="" &&
"$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
.ENDIF # "$(MAKETARGETS)"!=""
-broffice_%{$(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 $(MSIOFFICETEMPLATEDIR) -msilanguage
$(MISC)$/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 BrOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b))
$(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
-$(foreach,i,$(alllangiso) brofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
-brofficewithjre_%{$(PKGFORMAT:^".")} :
- +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
BrOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR)
-msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(alllangiso) brofficedev_$i) : $$@{$(PKGFORMAT:^".")}
-brofficedev_%{$(PKGFORMAT:^".")} :
- +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_Dev
-u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage
$(MISC)$/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 BrOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b))
$(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
-$(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
$(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
.ELSE # "$(alllangiso)"!=""
openoffice:
Modified: incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst?rev=1207925&r1=1207924&r2=1207925&view=diff
==============================================================================
--- incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst (original)
+++ incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst Tue Nov 29
15:34:52 2011
@@ -386,214 +386,3 @@ OpenOffice_Dev_SDK
include
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarenvpath}/{os}/MS
}
}
-
-BrOffice
-{
- Settings
- {
- variables
- {
- PRODUCTNAME BrOffice.org
- PRODUCTVERSION 3.4
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
- POSTVERSIONEXTENSION
- POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.0
- PROGRESSBARCOLOR
- PROGRESSSIZE
- PROGRESSPOSITION
- PROGRESSFRAMECOLOR
- NATIVEPROGRESS
- UPDATEURL
http://update38.services.openoffice.org/ProductUpdateService/check.Update
- ODFNOTIFYURL
http://odfnotify.services.openoffice.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.4.0
- PACKAGEREVISION {milestone}
- LICENSENAME LGPL
- SETSTATICPATH 1
- GLOBALFILEGID gid_File_Lib_Vcl
- GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
- SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
- OOODOWNLOADNAME 1
- XPDINSTALLER 0
- BETAUPGRADECODE
- STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
- CHANGETARGETDIR 1
- USE_FILEVERSION 1
- LIBRARYVERSION 9.4.0
- CODEFILENAME codes_broo.txt
- PATCHCODEFILE bro_patchcodes.txt
- DOWNLOADBANNER brobanner.bmp
- DOWNLOADBITMAP brobitmap.bmp
- DOWNLOADSETUPICO ooosetup.ico
- WINDOWSBITMAPDIRECTORY
..\inc_broffice\windows\msi_templates\Binary
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL
http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
- STARTCENTER_INFO_URL
http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
- STARTCENTER_TEMPLREP_URL
http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
- STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT OpenOffice.org
- REGISTRATION_CID 926117
- DICT_REPO_URL
http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
- }
- active 1
- compression 5
- script setup_osl
- downloadname BrOo_{productversion}_{os}_install_{languages}
- langpackdownloadname
BrOo_{productversion}_languagepack_{os}_install_{languages}
- include
{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
- }
-}
-
-BrOffice_wJRE
-{
- Settings
- {
- variables
- {
- PRODUCTNAME BrOffice.org
- PRODUCTVERSION 3.4
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
- POSTVERSIONEXTENSION
- POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.0
- PROGRESSBARCOLOR
- PROGRESSSIZE
- PROGRESSPOSITION
- PROGRESSFRAMECOLOR
- NATIVEPROGRESS
- UPDATEURL
http://update38.services.openoffice.org/ProductUpdateService/check.Update
- ODFNOTIFYURL
http://odfnotify.services.openoffice.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.4.0
- PACKAGEREVISION {milestone}
- LICENSENAME LGPL
- WITHJREPRODUCT 1
- SETSTATICPATH 1
- GLOBALFILEGID gid_File_Lib_Vcl
- GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
- SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
- OOODOWNLOADNAME 1
- XPDINSTALLER 1
- BETAUPGRADECODE
- STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
- CHANGETARGETDIR 1
- USE_FILEVERSION 1
- LIBRARYVERSION 9.4.0
- CODEFILENAME codes_broo.txt
- PATCHCODEFILE bro_patchcodes.txt
- JAVAPRODUCT 1
- DOWNLOADBANNER brobanner.bmp
- DOWNLOADBITMAP brobitmap.bmp
- DOWNLOADSETUPICO ooosetup.ico
- WINDOWSBITMAPDIRECTORY
..\inc_broffice\windows\msi_templates\Binary
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL
http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
- STARTCENTER_INFO_URL
http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
- STARTCENTER_TEMPLREP_URL
http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
- STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT OpenOffice.org
- REGISTRATION_CID 926117
- DICT_REPO_URL
http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
- }
- active 1
- compression 5
- script setup_osljre
- downloadname
BrOo_{productversion}_{os}_installwjre_{languages}
- include
{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
- }
-}
-
-BrOffice_Dev
-{
- Settings
- {
- variables
- {
- PRODUCTNAME BrOo-dev
- PRODUCTVERSION 3.4
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
- BASISROOTNAME OOo-dev
- UNIXBASISROOTNAME ooo-dev
- POSTVERSIONEXTENSION
- POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.0
- DEVELOPMENTPRODUCT 1
- BASISPACKAGEPREFIX ooobasis-dev
- UREPACKAGEPREFIX ooodev
- SOLSUREPACKAGEPREFIX ooodev
- REGISTRYLAYERNAME LayerDevBroffice
- SERVICETAG_URN
urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
- UPDATEURL
http://update38.services.openoffice.org/ProductUpdateService/check.Update
- ODFNOTIFYURL
http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
- ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
- EVAL
- FILEFORMATNAME OpenOffice.org
- FILEFORMATVERSION 1.0
- WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.0
- PACKAGEREVISION {milestone}
- LICENSENAME LGPL
- SETSTATICPATH 1
- GLOBALFILEGID gid_File_Lib_Vcl
- GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
- SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
- OOODOWNLOADNAME 1
- XPDINSTALLER 1
- BETAUPGRADECODE
- STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
- CHANGETARGETDIR 1
- USE_FILEVERSION 1
- JAVAPRODUCT 1
- LIBRARYVERSION 9.4.0
- PATCHCODEFILE brodev_patchcodes.txt
- CODEFILENAME codes_broodev.txt
- DOWNLOADBANNER brobanner.bmp
- DOWNLOADBITMAP brobitmap.bmp
- DOWNLOADSETUPICO ooosetup.ico
- WINDOWSBITMAPDIRECTORY
..\inc_broffice\windows\msi_templates\Binary
- LOCALUSERDIR $ORIGIN/..
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL
http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794
- STARTCENTER_INFO_URL
http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp
- STARTCENTER_TEMPLREP_URL
http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383
- STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT OpenOffice.org
- REGISTRATION_CID 926117
- DICT_REPO_URL
http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
- }
- active 1
- compression 5
- script setup_osljre
- downloadname
BrOo-dev_{productversion}_{os}_install_{languages}
- langpackdownloadname
BrOo_{productversion}_languagepack_{os}_install_{languages}
- include
{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice_dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice_dev,{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
- }
-}
Modified: incubator/ooo/trunk/main/instsetoo_native/util/pack.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/instsetoo_native/util/pack.lst?rev=1207925&r1=1207924&r2=1207925&view=diff
==============================================================================
--- incubator/ooo/trunk/main/instsetoo_native/util/pack.lst (original)
+++ incubator/ooo/trunk/main/instsetoo_native/util/pack.lst Tue Nov 29 15:34:52
2011
@@ -9,16 +9,12 @@
OpenOffice
unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro
en-US openoffice
OpenOffice unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12
en-US openoffice
-#BrOffice
pt-BR broffice
#OpenOffice_wJRE
unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,wntmsci12
en-US openofficewithjre
-#BrOffice_wJRE
pt-BR brofficewithjre
OpenOffice_Dev
unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro
en-US openofficedev
-#BrOffice_Dev
pt-BR brofficedev
#OpenOffice_SDK
unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12
en-US sdkoo
OpenOffice_Dev_SDK
unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12
en-US sdkoodev
#URE
unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12
en-US ure
OpenOfficeLanguagepack
unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro
de|ja ooolanguagepack
OpenOfficeLanguagepack unxlngi6,unxsoli4,unxsols4,wntmsci12,unxmacxi
de ooolanguagepack
OpenOfficeDevLanguagepack
unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro
ar|as|ast|be-BY|bg|bn|ca|ca-XV|cs|da|de|dz|el|en-GB|eo|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|ka|km|kn|ko|ku|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|sh|si|sk|sl|sr|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW
ooodevlanguagepack
-#BrOfficeLanguagepack
unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro pt-BR
broolanguagepack
Modified: incubator/ooo/trunk/main/setup_native/prj/d.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/setup_native/prj/d.lst?rev=1207925&r1=1207924&r2=1207925&view=diff
==============================================================================
--- incubator/ooo/trunk/main/setup_native/prj/d.lst (original)
+++ incubator/ooo/trunk/main/setup_native/prj/d.lst Tue Nov 29 15:34:52 2011
@@ -1,5 +1,4 @@
mkdir: %_DEST%\bin%_EXT%\osl
-mkdir: %_DEST%\bin%_EXT%\broffice
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe
..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
@@ -36,11 +35,7 @@ mkdir: %_DEST%\bin%_EXT%\osolsmf
..\source\mac\ooo\osxdndinstall_nologo.png
%_DEST%\bin%_EXT%\osl\osxdndinstall_nologo.png
..\source\mac\ooo\DS_Store %_DEST%\bin%_EXT%\osl\DS_Store
..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin%_EXT%\osl\DS_Store_Langpack
-..\source\mac\broffice\osxdndinstall.png
%_DEST%\bin%_EXT%\broffice\osxdndinstall.png
-..\source\mac\broffice\osxdndinstall_nologo.png
%_DEST%\bin%_EXT%\broffice\osxdndinstall_nologo.png
-..\source\mac\broffice\DS_Store %_DEST%\bin%_EXT%\broffice\DS_Store
..\source\java\openofficeorg_setup.gif %_DEST%\bin%_EXT%\osl\Setup.gif
-..\source\java\brofficeorg_setup.gif %_DEST%\bin%_EXT%\broffice\Setup.gif
..\source\java\javaversion.dat %_DEST%\bin%_EXT%\javaversion.dat
..\source\java\javaversion2.dat %_DEST%\bin%_EXT%\javaversion2.dat
..\source\opensolaris\bundledextensions\installed
%_DEST%\bin%_EXT%\osolsmf\installed
Modified: incubator/ooo/trunk/main/solenv/bin/modules/installer/download.pm
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/modules/installer/download.pm?rev=1207925&r1=1207924&r2=1207925&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/modules/installer/download.pm (original)
+++ incubator/ooo/trunk/main/solenv/bin/modules/installer/download.pm Tue Nov
29 15:34:52 2011
@@ -478,14 +478,6 @@ sub get_downloadname_productname
if (( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "OOo-Dev-SDK"; }
if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "OOo-URE"; }
-
- if ( $allvariables->{'PRODUCTNAME'} eq "BrOffice.org" ) { $start =
"BrOo"; }
-
- if ( $allvariables->{'PRODUCTNAME'} eq "BrOo-dev" ) { $start =
"BrOo-Dev"; }
-
- if (( $allvariables->{'PRODUCTNAME'} eq "BrOffice.org" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "BrOo-SDK"; }
-
- if (( $allvariables->{'PRODUCTNAME'} eq "BrOo-dev" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "BrOo-Dev-SDK"; }
return $start;
}
Modified: incubator/ooo/trunk/main/sysui/desktop/productversion.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/productversion.mk?rev=1207925&r1=1207924&r2=1207925&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/productversion.mk (original)
+++ incubator/ooo/trunk/main/sysui/desktop/productversion.mk Tue Nov 29
15:34:52 2011
@@ -43,7 +43,7 @@ RPMMACROS= \
PKGDIR=$(BIN)
.ENDIF
-PRODUCTLIST = openoffice.org broffice.org
+PRODUCTLIST = openoffice.org
# default values to minimize maintainance effort
PRODUCTVERSION = 3.4
@@ -68,11 +68,3 @@ PKGVERSION.openoffice.org = $(PKGVERSION
UNIXFILENAME.openoffice.org =
$(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSIONSHORT.openoffice.org)
ICONPREFIX.openoffice.org = $(UNIXFILENAME.openoffice.org:s/.//g)
-PRODUCTNAME.broffice.org = BrOffice.org
-PRODUCTVERSION.broffice.org = $(PRODUCTVERSION)
-PRODUCTVERSIONSHORT.broffice.org = $(PRODUCTVERSIONSHORT)
-PKGVERSION.broffice.org = $(PKGVERSION)
-UNIXFILENAME.broffice.org =
$(PRODUCTNAME.broffice.org:l)$(PRODUCTVERSIONSHORT.broffice.org)
-ICONPREFIX.broffice.org = $(UNIXFILENAME.broffice.org:s/.//g)
-
-
Modified: incubator/ooo/trunk/main/testautomation/global/input/officeinfo.txt
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/global/input/officeinfo.txt?rev=1207925&r1=1207924&r2=1207925&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/global/input/officeinfo.txt
(original)
+++ incubator/ooo/trunk/main/testautomation/global/input/officeinfo.txt Tue Nov
29 15:34:52 2011
@@ -1,4 +1,3 @@
[Current program versions]
Oracle Open Office=3.4
OpenOffice.org=3.4
-BrOffice.org=3.4
