Author: af
Date: Thu Feb 27 09:53:06 2014
New Revision: 1572486
URL: http://svn.apache.org/r1572486
Log:
124311: Merge in revision 1572480 from AOO410: adding 'beta' to product names
and images.
Added:
openoffice/trunk/main/default_images/framework/res/beta/
- copied from r1572480,
openoffice/branches/AOO410/main/default_images/framework/res/beta/
openoffice/trunk/main/default_images/introabout/beta/
- copied from r1572480,
openoffice/branches/AOO410/main/default_images/introabout/beta/
openoffice/trunk/main/solenv/bin/replace_in_zip.pl
- copied unchanged from r1572480,
openoffice/branches/AOO410/main/solenv/bin/replace_in_zip.pl
Modified:
openoffice/trunk/ (props changed)
openoffice/trunk/main/desktop/prj/d.lst
openoffice/trunk/main/desktop/zipintro/makefile.mk
openoffice/trunk/main/instsetoo_native/util/makefile.mk
openoffice/trunk/main/instsetoo_native/util/openoffice.lst
Propchange: openoffice/trunk/
------------------------------------------------------------------------------
Merged /openoffice/branches/AOO410:r1572480
Modified: openoffice/trunk/main/desktop/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/prj/d.lst?rev=1572486&r1=1572485&r2=1572486&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/prj/d.lst (original)
+++ openoffice/trunk/main/desktop/prj/d.lst Thu Feb 27 09:53:06 2014
@@ -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
Modified: openoffice/trunk/main/desktop/zipintro/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/zipintro/makefile.mk?rev=1572486&r1=1572485&r2=1572486&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/zipintro/makefile.mk (original)
+++ openoffice/trunk/main/desktop/zipintro/makefile.mk Thu Feb 27 09:53:06 2014
@@ -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 : $(COMMO
@@-$(MKDIR) $(@:d)
@$(COPY) $< $@
+$(COMMONBIN)$/beta$/intro.zip : $(COMMONBIN)$/beta_intro.zip
+ @@-$(MKDIR) $(@:d)
+ @$(COPY) $< $@
+
$(MISC)$/%.bmp : $(SOLARSRC)$/%.bmp
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
Modified: openoffice/trunk/main/instsetoo_native/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/makefile.mk?rev=1572486&r1=1572485&r2=1572486&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/makefile.mk (original)
+++ openoffice/trunk/main/instsetoo_native/util/makefile.mk Thu Feb 27 09:53:06
2014
@@ -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
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) :
$(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
$(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 : $(SOLARCOMMONPC
@-$(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 :
Modified: openoffice/trunk/main/instsetoo_native/util/openoffice.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/openoffice.lst?rev=1572486&r1=1572485&r2=1572486&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/openoffice.lst (original)
+++ openoffice/trunk/main/instsetoo_native/util/openoffice.lst Thu Feb 27
09:53:06 2014
@@ -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
+ }
+}
