[Libreoffice-commits] core.git: Branch 'aoo/trunk' - instsetoo_native/util solenv/bin

Raphael Bircher rbircher at apache.org
Mon Mar 17 13:08:06 PDT 2014


 instsetoo_native/util/makefile.mk        |    7 ---
 instsetoo_native/util/openoffice.lst     |   59 -------------------------------
 instsetoo_native/util/pack.lst           |    1 
 solenv/bin/modules/installer/download.pm |    7 ---
 4 files changed, 74 deletions(-)

New commits:
commit 42430a090a66ca04ed507a4ab28b98a4dc7c7747
Author: Raphael Bircher <rbircher at apache.org>
Date:   Mon Mar 17 18:28:10 2014 +0000

    Removal of wJRE look at issue #124432

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 2577150..7c8c756 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -78,7 +78,6 @@ help .PHONY :
     @echo "    aoo_srcrelease         packs the source release package"
     @echo "    updatepack"
     @echo "    openofficedev          devloper snapshot"
-    @echo "    openofficewithjre"
     @echo "    ooolanguagepack"
     @echo "    ooobetalanguagepack"
     @echo "    ooodevlanguagepack"
@@ -185,7 +184,6 @@ openoffice:
 openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
 openofficedev: $(foreach,i,$(alllangiso) openofficedev_$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)
@@ -223,7 +221,6 @@ $(foreach,i,$(alllangiso) openoffice_$i) : adddeps
 openoffice_$(defaultlangiso).archive : adddeps
 $(foreach,i,$(alllangiso) openofficedev_$i) : adddeps
 $(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
@@ -236,7 +233,6 @@ $(foreach,i,$(alllangiso) sdkoodev_$i) : adddeps
 # where $language ranges over all languages in $(alllangiso) 
 # and $package ranges over all package formats in $(PKGFORMAT)
 $(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
-$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
 $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
 $(foreach,i,$(alllangiso) openofficebeta_$i) : $$@{$(PKGFORMAT:^".")}
 $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
@@ -281,9 +277,6 @@ $(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) openoffice_$L.$P)) .PHO
         $(PRJ)$/util$/update.xml	\
         > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-#openofficewithjre_%{$(PKGFORMAT:^".")} :
-$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) openofficewithjre_$L.$P)) .PHONY :
-    $(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_wJRE -msitemplate $(MSIOFFICETEMPLATEDIR)
 
 #openofficedev_%{$(PKGFORMAT:^".")} :
 $(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) openofficedev_$L.$P)) .PHONY :
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
old mode 100755
new mode 100644
index e2e8401..4ed8f31
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -111,65 +111,6 @@ Apache_OpenOffice
     }
 }
 
-Apache_OpenOffice_wJRE
-{
-    Settings
-    {
-        variables
-        {
-            FULLPRODUCTNAME Apache OpenOffice
-            PRODUCTNAME OpenOffice
-            PRODUCTVERSION 4.1.0
-            PRODUCTEXTENSION 
-            LONG_PRODUCTEXTENSION 
-            SHORT_PRODUCTEXTENSION 
-            POSTVERSIONEXTENSION
-            POSTVERSIONEXTENSIONUNIX
-            BRANDPACKAGEVERSION 4
-            USERDIRPRODUCTVERSION 4
-            ABOUTBOXPRODUCTVERSION 4.1.0
-            BASEPRODUCTVERSION 4.1
-            UPDATEURL https://ooo-updates.apache.org/aoonext/check.Update
-            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
-            REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
-            ADDSYSTEMINTEGRATION 1
-            EVAL
-            PACKAGEVERSION 4.1.0
-            PACKAGEREVISION {milestone}
-            LICENSENAME ALv2
-            WITHJREPRODUCT 1
-            GLOBALFILEGID gid_File_Lib_Vcl
-            GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
-            SPELLCHECKERFILE spellchecker_selection.txt
-            OPENSOURCE 1
-            SETSTATICPATH 1
-            AOODOWNLOADNAME 1
-            AOODOWNLOADNAMEPREFIX Apache_OpenOffice_wJRE
-            XPDINSTALLER 1
-            BETAUPGRADECODE
-            STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
-            CHANGETARGETDIR 1
-            USE_FILEVERSION 1
-            LIBRARYVERSION 10.0.0
-            PATCHCODEFILE ooo_patchcodes.txt
-            JAVAPRODUCT 1
-            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_osljre
-        downloadname	Apache_OpenOffice_{productversion}_{os}_installwjre_{languages}
-        include			{solarenvpath}/{os}/loader2,.,{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},../../external/common,{solarenvpath}/{os}/OOo_external
-    }
-}
 
 Apache_OpenOffice_Dev
 {
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 279268e..1054d4f 100644
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -9,7 +9,6 @@
 
 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
-#OpenOffice_wJRE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,wntmsci12                    en-US   openofficewithjre
 OpenOffice_Dev  unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro    en-US   openofficedev
 #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
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 5cf45c2..d373fca 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -669,11 +669,6 @@ sub get_install_type
             $type = $type . "-arc";
         }
 
-        if (( $allvariables->{'WITHJREPRODUCT'} ) && ( $allvariables->{'WITHJREPRODUCT'} == 1 ))
-        {
-            $type = $type . "-wJRE";
-        }
-
     }
 
     return $type;
@@ -689,8 +684,6 @@ sub get_downloadname_addon
 
     if ( $installer::globals::islinuxdebbuild ) { $addon = $addon . "_deb"; }
 
-    if ( $installer::globals::product =~ /_wJRE\s*$/ ) { $addon = "_wJRE"; }
-
     return $addon;
 }
 


More information about the Libreoffice-commits mailing list