From a3eb01f1675d473580c3b1fa87072852f97b6daa Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Tue, 26 Jan 2021 19:07:21 +0100 Subject: packaging: remove resolve_variables_in_downloadname OOODOWNLOADNAME was set in the global section of openoffice.lst, so the code always did set the target path with set_download_filename. Thus remove the superfluous sub and then also the no longer used OOODOWNLOADNAME variables In the same vein: the "script that extracts a tarball that is appended to it" method is no longer in use since many years, delete that as well. Change-Id: I43481a3ec09e064ef77138e1cbfc1dba6854f2d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110017 Tested-by: Jenkins Reviewed-by: Christian Lohmaier (cherry picked from commit 443f65e9aff72442348e8e0c7162762c7a68ee05) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109990 Reviewed-by: Michael Stahl --- instsetoo_native/util/openoffice.lst.in | 3 --- 1 file changed, 3 deletions(-) (limited to 'instsetoo_native') diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 343cbfec2096..dc6d2d97861e 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -31,7 +31,6 @@ Globals UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt WINDOWSPATCHLEVEL 8 - OOODOWNLOADNAME 1 64BITPRODUCT @WINDOWS_X64@ WINDOWSSDKVERSION @WINDOWS_SDK_VERSION@ CRASHDUMPENABLE @DEFAULT_CRASHDUMP_VALUE@ @@ -65,7 +64,6 @@ LibreOffice ROOTMODULEGID gid_Module_Root GLOBALPATCHFILEGID gid_File_Txt_Patchfiles SPELLCHECKERFILE spellchecker_selection.txt - OOODOWNLOADNAME 1 CHANGETARGETDIR 1 PATCHCODEFILE ooo_patchcodes.txt STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/ @@ -114,7 +112,6 @@ LibreOfficeDev ROOTMODULEGID gid_Module_Root GLOBALPATCHFILEGID gid_File_Txt_Patchfiles SPELLCHECKERFILE spellchecker_selection.txt - OOODOWNLOADNAME 1 CHANGETARGETDIR 1 PATCHCODEFILE ooodev_patchcodes.txt CODEFILENAME codes_ooodev.txt -- cgit