You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2014/02/27 15:54:23 UTC
svn commit: r1572608 - in /openoffice/trunk/main: instsetoo_native/util/
scp2/source/ooo/ scp2/source/sdkoo/ setup_native/prj/
setup_native/source/mac/ooo/ setup_native/source/mac/sdk/ solenv/bin/
solenv/bin/modules/installer/ solenv/inc/
Author: jsc
Date: Thu Feb 27 14:54:22 2014
New Revision: 1572608
URL: http://svn.apache.org/r1572608
Log:
#124311# merge from AOO410 branch
Added:
openoffice/trunk/main/setup_native/source/mac/ooo/DS_Store_Beta (with props)
openoffice/trunk/main/setup_native/source/mac/ooo/DS_Store_Langpack_Beta (with props)
openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall_beta.png (with props)
openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall_lang_beta.png (with props)
openoffice/trunk/main/setup_native/source/mac/sdk/DS_Store_SDK_Beta (with props)
openoffice/trunk/main/setup_native/source/mac/sdk/osxdndinstall_sdk_beta.png (with props)
Modified:
openoffice/trunk/main/instsetoo_native/util/makefile.mk
openoffice/trunk/main/instsetoo_native/util/openoffice.lst
openoffice/trunk/main/scp2/source/ooo/scpaction_ooo.scp
openoffice/trunk/main/scp2/source/sdkoo/sdkoo.scp
openoffice/trunk/main/setup_native/prj/d.lst
openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall.png
openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall_lang.png
openoffice/trunk/main/setup_native/source/mac/sdk/osxdndinstall_sdk.png
openoffice/trunk/main/solenv/bin/make_installer.pl
openoffice/trunk/main/solenv/bin/modules/installer/globals.pm
openoffice/trunk/main/solenv/bin/modules/installer/scriptitems.pm
openoffice/trunk/main/solenv/bin/modules/installer/systemactions.pm
openoffice/trunk/main/solenv/inc/minor.mk
Modified: openoffice/trunk/main/instsetoo_native/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/makefile.mk?rev=1572608&r1=1572607&r2=1572608&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/makefile.mk (original)
+++ openoffice/trunk/main/instsetoo_native/util/makefile.mk Thu Feb 27 14:54:22 2014
@@ -25,7 +25,7 @@ TARGET=util
.INCLUDE: settings.mk
.INCLUDE: $(SOLARINCDIR)$/rtlbootstrap.mk
-.INCLUDE: $(SOLARENVINC)$/version.mk
+#.INCLUDE: $(SOLARENVINC)$/version.mk
# watch for the path delimiter
.IF "$(GUI)"=="WNT"
@@ -80,9 +80,11 @@ help .PHONY :
@echo " openofficedev devloper snapshot"
@echo " openofficewithjre"
@echo " ooolanguagepack"
+ @echo " ooobetalanguagepack"
@echo " ooodevlanguagepack"
- @echo " sdkoo"
- @echo " sdkoodev"
+ @echo " sdkoo builds the developer SDK package"
+ @echo " sdkoobeta like sdkoo but with 'Beta' appended to the product name"
+ @echo " sdkoodev builds the developer snapshot of the SDK"
@echo " openofficebeta like openoffice but with 'Beta' appended to product name"
@echo
@echo "experimental targets:"
@@ -182,11 +184,13 @@ 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)
+openofficebeta: $(foreach,i,$(alllangiso) openofficebeta_$i)
openofficewithjre: $(foreach,i,$(alllangiso) openofficewithjre_$i)
ooolanguagepack : $(foreach,i,$(alllangiso) ooolanguagepack_$i)
+ooobetalanguagepack : $(foreach,i,$(alllangiso) ooobetalanguagepack_$i)
ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
+sdkoobeta: $(foreach,i,$(alllangiso) sdkoobeta_$i)
sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
patch-create: $(foreach,i,$(alllangiso) patch-create_$i)
@@ -218,11 +222,13 @@ 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) openofficebeta_$i) : adddeps $(BETA_LOGO_SPLASH)
$(foreach,i,$(alllangiso) openofficewithjre_$i) : adddeps
$(foreach,i,$(alllangiso) ooolanguagepack_$i) : adddeps
+$(foreach,i,$(alllangiso) ooobetalanguagepack_$i) : adddeps
$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : adddeps
$(foreach,i,$(alllangiso) sdkoo_$i) : adddeps
+$(foreach,i,$(alllangiso) sdkoobeta_$i) : adddeps
$(foreach,i,$(alllangiso) sdkoodev_$i) : adddeps
# Create targets that take the package formats into account. Together with language dependency we
@@ -232,10 +238,12 @@ $(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) openofficebeta_$i) : $$@{$(PKGFORMAT:^".")}
$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(alllangiso) ooobetalanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
$(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(alllangiso) sdkoobeta_$i) : $$@{$(PKGFORMAT:^".")}
$(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
$(foreach,i,$(alllangiso) patch-create_$i) : $$@{$(PKGFORMAT:^".")}
@@ -287,7 +295,7 @@ $(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 :
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) openofficebeta_$L.$P)) .PHONY :
$(MAKE_INSTALLER_COMMAND) \
-p Apache_OpenOffice_Beta \
-msitemplate $(MSIOFFICETEMPLATEDIR)
@@ -303,6 +311,13 @@ $(foreach,P,$(PACKAGE_FORMATS) $(foreach
-msitemplate $(MSILANGPACKTEMPLATEDIR) \
-languagepack
+#ooobetalanguagepack_%{$(PKGFORMAT:^".")} :
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) ooobetalanguagepack_$L.$P)) .PHONY :
+ $(MAKE_INSTALLER_COMMAND) \
+ -p Apache_OpenOffice_Beta \
+ -msitemplate $(MSILANGPACKTEMPLATEDIR) \
+ -languagepack
+
#ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) ooodevlanguagepack_$L.$P)) .PHONY :
$(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_Dev -msitemplate $(MSILANGPACKTEMPLATEDIR) -languagepack
@@ -311,6 +326,10 @@ $(foreach,P,$(PACKAGE_FORMATS) $(foreach
$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) sdkoo_$L.$P)) .PHONY :
$(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_SDK -msitemplate $(MSISDKOOTEMPLATEDIR) -dontstrip
+#sdkoobeta_%{$(PKGFORMAT:^".")} :
+$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) sdkoobeta_$L.$P)) .PHONY :
+ $(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_Beta_SDK -msitemplate $(MSISDKOOTEMPLATEDIR) -dontstrip
+
#sdkoodev_%{$(PKGFORMAT:^".")} :
$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) sdkoodev_$L.$P)) .PHONY :
$(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_Dev_SDK -msitemplate $(MSISDKOOTEMPLATEDIR) -dontstrip
@@ -332,9 +351,9 @@ $(BIN)$/beta$/intro.zip : $(SOLARCOMMONP
$(COPY) $< $@
# Replace framework/res/*.png with *-beta.png
-$(BIN)$/beta$/images.zip : $(SOLARSHAREDBIN)$/images.zip
+$(BIN)$/beta$/images.zip : $(SOLARBINDIR)$/images.zip
$(COPY) $< $@
- $(SOLARENV)$/bin/replace_in_zip.pl \
+ $(PERL) $(SOLARENV)$/bin/replace_in_zip.pl \
$@ \
framework/res/ \
$(SRC_ROOT)/default_images/framework/res/beta/ \
@@ -346,7 +365,7 @@ $(BIN)$/beta$/images.zip : $(SOLARSHARED
.IF "$(OS)" == "WNT"
$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) patch-create_$L.$P)) .PHONY :
@echo building $@
- perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl \
+ $(PERL) -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl \
create \
--product-name Apache_OpenOffice \
--output-path $(OUT) \
@@ -355,7 +374,7 @@ $(foreach,P,$(PACKAGE_FORMATS) $(foreach
--language $(subst,$(@:s/_/ /:1)_, $(@:b)) \
--package-format $(@:e:s/.//)
patch-apply .PHONY :
- perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl \
+ $(PERL) -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl \
apply \
--product-name Apache_OpenOffice \
--output-path $(OUT) \
@@ -363,7 +382,7 @@ patch-apply .PHONY :
--language en-US \
--package-format msi
patch-update-releases-xml .PHONY:
- perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl \
+ $(PERL) -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl \
update-releases-xml \
--product-name Apache_OpenOffice \
--output-path $(OUT) \
@@ -371,7 +390,7 @@ patch-update-releases-xml .PHONY:
--target-version 4.0.1
$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) patch-check_$L.$P)) .PHONY :
@echo building $@
- perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl \
+ $(PERL) -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl \
check \
--product-name Apache_OpenOffice \
--output-path $(OUT) \
Modified: openoffice/trunk/main/instsetoo_native/util/openoffice.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/openoffice.lst?rev=1572608&r1=1572607&r2=1572608&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/openoffice.lst (original)
+++ openoffice/trunk/main/instsetoo_native/util/openoffice.lst Thu Feb 27 14:54:22 2014
@@ -249,6 +249,7 @@ Apache_OpenOffice_SDK
{
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
+ PRODUCTDIRNAME OpenOffice_SDK
PRODUCTVERSION 4.1.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -287,6 +288,53 @@ Apache_OpenOffice_SDK
}
}
+Apache_OpenOffice_Beta_SDK
+{
+ Settings
+ {
+ downloadname Apache_OpenOffice-Beta-SDK_{packageversion}_{os}_install_{languages}
+ variables
+ {
+ FULLPRODUCTNAME Apache OpenOffice Beta
+ PRODUCTNAME OpenOffice Beta
+ PRODUCTDIRNAME OpenOffice_SDK_Beta
+ PRODUCTVERSION 4.1.0
+ PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION
+ POSTVERSIONEXTENSION SDK
+ POSTVERSIONEXTENSIONUNIX sdk
+ BRANDPACKAGEVERSION 4
+ PACKAGEVERSION 4.1.0
+ PACKAGEREVISION {milestone}
+ PACK_INSTALLED 1
+ POOLPRODUCT 0
+ DMG_VOLUMEEXTENSION SDK
+ DATABASENAME openofficeorg410betasdk
+ NO_README_IN_ROOTDIR 1
+ LICENSENAME ALv2
+ IGNOREDIRECTORYLAYER 1
+ NOSPACEINDIRECTORYNAME 1
+ NOLANGUAGESELECTIONPRODUCT 1
+ CHANGETARGETDIR 1
+ DOWNLOADBANNER ooosdkbanner.bmp
+ DOWNLOADBITMAP ooosdkbitmap.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ DONTUSESTARTMENUFOLDER 1
+ RELATIVE_PATHES_IN_DDF 1
+ AOODOWNLOADNAMEPREFIX Apache_OpenOffice-Beta-SDK
+ 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 sdkoo
+ include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarenvpath}/{os}/MS
+ }
+}
+
Apache_OpenOffice_Dev_SDK
{
Settings
Modified: openoffice/trunk/main/scp2/source/ooo/scpaction_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/scpaction_ooo.scp?rev=1572608&r1=1572607&r2=1572608&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/scpaction_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/scpaction_ooo.scp Thu Feb 27 14:54:22 2014
@@ -319,6 +319,8 @@ End
ScpAction scp_Copy_Dmg_Background_Image
Copy = "osxdndinstall.png";
LangPackCopy = "osxdndinstall_lang.png";
+ BetaCopy = "osxdndinstall_beta.png";
+ LangBetaCopy = "osxdndinstall_lang_beta.png";
Name = "background.png";
UnixRights = 444;
Styles = (FORCELANGUAGEPACK);
@@ -329,6 +331,8 @@ ScpAction scp_Copy_Ds_Store
Copy = "DS_Store";
DevCopy = "DS_Store_Dev";
LangPackCopy = "DS_Store_Langpack";
+ BetaCopy = "DS_Store_Beta";
+ LangBetaCopy = "DS_Store_Langpack_Beta";
PatchCopy = "DS_Store_Patch";
Name = ".DS_Store";
UnixRights = 444;
Modified: openoffice/trunk/main/scp2/source/sdkoo/sdkoo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/sdkoo/sdkoo.scp?rev=1572608&r1=1572607&r2=1572608&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/sdkoo/sdkoo.scp (original)
+++ openoffice/trunk/main/scp2/source/sdkoo/sdkoo.scp Thu Feb 27 14:54:22 2014
@@ -60,7 +60,8 @@ End
Directory gid_Dir_Basis_Sdk
#if defined MACOSX
ParentID = PREDEFINED_PROGDIR;
- DosName = "OpenOffice_SDK";
+# DosName = "OpenOffice_SDK";
+ DosName = "${PRODUCTDIRNAME}";
#else
ParentID = gid_Dir_OpenOffice_Sdk;
DosName = "sdk";
@@ -217,6 +218,7 @@ End
#ifdef MACOSX
ScpAction scp_Copy_Dmg_Background_Image
Copy = "osxdndinstall_sdk.png";
+ BetaCopy = "osxdndinstall_sdk_beta.png";
Name = "background.png";
UnixRights = 444;
Styles = ();
@@ -225,7 +227,7 @@ End
ScpAction scp_Copy_Ds_Store
Copy = "DS_Store_SDK";
-# PatchCopy = "DS_Store_Patch";
+ BetaCopy = "DS_Store_SDK_Beta";
Name = ".DS_Store";
UnixRights = 444;
Styles = ();
Modified: openoffice/trunk/main/setup_native/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/prj/d.lst?rev=1572608&r1=1572607&r2=1572608&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/prj/d.lst (original)
+++ openoffice/trunk/main/setup_native/prj/d.lst Thu Feb 27 14:54:22 2014
@@ -33,12 +33,18 @@ mkdir: %_DEST%\bin%_EXT%\osolsmf
..\source\mac\Info.plist.langpack %_DEST%\bin%_EXT%\Info.plist.langpack
..\source\mac\ooo\osxdndinstall.png %_DEST%\bin%_EXT%\osl\osxdndinstall.png
..\source\mac\ooo\osxdndinstall_lang.png %_DEST%\bin%_EXT%\osl\osxdndinstall_lang.png
+..\source\mac\ooo\osxdndinstall_beta.png %_DEST%\bin%_EXT%\osl\osxdndinstall_beta.png
+..\source\mac\ooo\osxdndinstall_lang_beta.png %_DEST%\bin%_EXT%\osl\osxdndinstall_lang_beta.png
..\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_Beta %_DEST%\bin%_EXT%\osl\DS_Store_Beta
..\source\mac\ooo\DS_Store_Dev %_DEST%\bin%_EXT%\osl\DS_Store_Dev
..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin%_EXT%\osl\DS_Store_Langpack
+..\source\mac\ooo\DS_Store_Langpack_Beta %_DEST%\bin%_EXT%\osl\DS_Store_Langpack_Beta
..\source\mac\sdk\DS_Store_SDK %_DEST%\bin%_EXT%\osl\DS_Store_SDK
+..\source\mac\sdk\DS_Store_SDK_Beta %_DEST%\bin%_EXT%\osl\DS_Store_SDK_Beta
..\source\mac\sdk\osxdndinstall_sdk.png %_DEST%\bin%_EXT%\osl\osxdndinstall_sdk.png
+..\source\mac\sdk\osxdndinstall_sdk_beta.png %_DEST%\bin%_EXT%\osl\osxdndinstall_sdk_beta.png
..\source\java\openofficeorg_setup.gif %_DEST%\bin%_EXT%\osl\Setup.gif
..\source\java\javaversion.dat %_DEST%\bin%_EXT%\javaversion.dat
..\source\java\javaversion2.dat %_DEST%\bin%_EXT%\javaversion2.dat
Added: openoffice/trunk/main/setup_native/source/mac/ooo/DS_Store_Beta
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/mac/ooo/DS_Store_Beta?rev=1572608&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/trunk/main/setup_native/source/mac/ooo/DS_Store_Beta
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: openoffice/trunk/main/setup_native/source/mac/ooo/DS_Store_Langpack_Beta
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/mac/ooo/DS_Store_Langpack_Beta?rev=1572608&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/trunk/main/setup_native/source/mac/ooo/DS_Store_Langpack_Beta
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall.png?rev=1572608&r1=1572607&r2=1572608&view=diff
==============================================================================
Binary files - no diff available.
Added: openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall_beta.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall_beta.png?rev=1572608&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall_beta.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall_lang.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall_lang.png?rev=1572608&r1=1572607&r2=1572608&view=diff
==============================================================================
Binary files - no diff available.
Added: openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall_lang_beta.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall_lang_beta.png?rev=1572608&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/trunk/main/setup_native/source/mac/ooo/osxdndinstall_lang_beta.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: openoffice/trunk/main/setup_native/source/mac/sdk/DS_Store_SDK_Beta
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/mac/sdk/DS_Store_SDK_Beta?rev=1572608&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/trunk/main/setup_native/source/mac/sdk/DS_Store_SDK_Beta
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: openoffice/trunk/main/setup_native/source/mac/sdk/osxdndinstall_sdk.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/mac/sdk/osxdndinstall_sdk.png?rev=1572608&r1=1572607&r2=1572608&view=diff
==============================================================================
Binary files - no diff available.
Added: openoffice/trunk/main/setup_native/source/mac/sdk/osxdndinstall_sdk_beta.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/mac/sdk/osxdndinstall_sdk_beta.png?rev=1572608&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/trunk/main/setup_native/source/mac/sdk/osxdndinstall_sdk_beta.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: openoffice/trunk/main/solenv/bin/make_installer.pl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/make_installer.pl?rev=1572608&r1=1572607&r2=1572608&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/make_installer.pl (original)
+++ openoffice/trunk/main/solenv/bin/make_installer.pl Thu Feb 27 14:54:22 2014
@@ -1493,6 +1493,8 @@ if ( $installer::globals::iswindowsbuild
####################################################################
if (($installer::globals::ismacdmgbuild) && ($installer::globals::product =~ /OpenOffice_Dev/)) { $installer::globals::devsnapshotbuild = 1; }
+if (($installer::globals::ismacdmgbuild) && ($installer::globals::product =~ /Apache_OpenOffice_Beta/)) { $installer::globals::betabuild = 1; }
+
#####################################################################
# Including additional inc files for variable settings, if defined
#####################################################################
@@ -1576,7 +1578,10 @@ if (( ! $allvariableshashref->{'XPDINSTA
if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
if ( $installer::globals::patch ) { installer::scriptitems::use_patch_copy_scpaction($scpactionsinproductarrayref); }
-if (($installer::globals::devsnapshotbuild)) { installer::scriptitems::use_dev_copy_scpaction($scpactionsinproductarrayref); }
+if ($installer::globals::devsnapshotbuild) { installer::scriptitems::use_dev_copy_scpaction($scpactionsinproductarrayref); }
+if ($installer::globals::betabuild) { installer::scriptitems::use_beta_copy_scpaction($scpactionsinproductarrayref); }
+
+if ($installer::globals::betabuild && $installer::globals::languagepack) { installer::scriptitems::use_langbeta_copy_scpaction($scpactionsinproductarrayref); }
# $scpactionsinproductarrayref = installer::scriptitems::remove_scpactions_without_name($scpactionsinproductarrayref);
Modified: openoffice/trunk/main/solenv/bin/modules/installer/globals.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/globals.pm?rev=1572608&r1=1572607&r2=1572608&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/globals.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/globals.pm Thu Feb 27 14:54:22 2014
@@ -334,6 +334,7 @@ BEGIN
$addchildprojects = 0;
$languagepack = 0;
$devsnapshotbuild = 0;
+ $betabuild = 0;
$tab = 0;
$patch = 0;
$patchincludepath = "";
Modified: openoffice/trunk/main/solenv/bin/modules/installer/scriptitems.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/scriptitems.pm?rev=1572608&r1=1572607&r2=1572608&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/scriptitems.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/scriptitems.pm Thu Feb 27 14:54:22 2014
@@ -763,6 +763,36 @@ sub use_patch_hostname
}
################################################################################
+# Using beta copy action for beta builds
+################################################################################
+
+sub use_beta_copy_scpaction
+{
+ my ($scpactionsref) = @_;
+
+ for ( my $i = 0; $i <= $#{$scpactionsref}; $i++ )
+ {
+ my $onescpaction = ${$scpactionsref}[$i];
+ if (( $onescpaction->{'BetaCopy'} ) && ( $onescpaction->{'BetaCopy'} ne "" )) { $onescpaction->{'Copy'} = $onescpaction->{'BetaCopy'}; }
+ }
+}
+
+################################################################################
+# Using langpack beta copy action for language packs
+################################################################################
+
+sub use_langbeta_copy_scpaction
+{
+ my ($scpactionsref) = @_;
+
+ for ( my $i = 0; $i <= $#{$scpactionsref}; $i++ )
+ {
+ my $onescpaction = ${$scpactionsref}[$i];
+ if (( $onescpaction->{'LangBetaCopy'} ) && ( $onescpaction->{'LangBetaCopy'} ne "" )) { $onescpaction->{'Copy'} = $onescpaction->{'LangBetaCopy'}; }
+ }
+}
+
+################################################################################
# Using langpack copy action for language packs
################################################################################
Modified: openoffice/trunk/main/solenv/bin/modules/installer/systemactions.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/systemactions.pm?rev=1572608&r1=1572607&r2=1572608&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/systemactions.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/systemactions.pm Thu Feb 27 14:54:22 2014
@@ -490,7 +490,7 @@ sub copy_one_file
}
else
{
- $infoline = "ERROR: Could not copy $source to $dest\n";
+ $infoline = "ERROR: Could not copy #$source# to $dest\n";
$returnvalue = 0;
}
Modified: openoffice/trunk/main/solenv/inc/minor.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/minor.mk?rev=1572608&r1=1572607&r2=1572608&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/minor.mk (original)
+++ openoffice/trunk/main/solenv/inc/minor.mk Thu Feb 27 14:54:22 2014
@@ -19,7 +19,7 @@
#
# *************************************************************
RSCVERSION=410
-RSCREVISION=410m1(Build:9750)
-BUILD=9750
-LAST_MINOR=m1
+RSCREVISION=410m14(Build:9760)
+BUILD=9760
+LAST_MINOR=m14
SOURCEVERSION=AOO410