cli_ure: remove CLI version Packages

Tweak the installer so it reads the included files from SRCDIR.

Change-Id: Ic4d3d2c003c2d0c5aebea6dd32f5989f3d4f04e4

6 files changed, 6 insertions, 46 deletions

diff --git a/cli_ure/Module_cli_ure.mk b/cli_ure/Module_cli_ure.mk
index 0bd109300ccc..d1ff09073a18 100644
--- a/cli_ure/Module_cli_ure.mk
+++ b/cli_ure/Module_cli_ure.mk
@@ -9,10 +9,6 @@
 
 $(eval $(call gb_Module_Module,cli_ure))
 
-$(eval $(call gb_Module_add_targets,cli_ure,\
-    Package_version \
-))
-
 ifeq ($(COM),MSC)
 $(eval $(call gb_Module_add_targets,cli_ure,\
 	CliLibrary_cli_basetypes \
diff --git a/cli_ure/Package_version.mk b/cli_ure/Package_version.mk
deleted file mode 100644
index 675d32a98fc6..000000000000
--- a/cli_ure/Package_version.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,cli_ure_version,$(SRCDIR)/cli_ure/version))
-
-$(eval $(call gb_Package_set_outdir,cli_ure_version,$(OUTDIR)))
-
-$(eval $(call gb_Package_add_file,cli_ure_version,bin/cliureversion.mk,version.txt))
-
-# vim: set noet sw=4 ts=4:
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index a23b6a113bcc..11b2a6f295f5 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -55,7 +55,7 @@ LibreOffice
             BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
             PCPFILENAME libreoffice.pcp
             UPDATEURL http://update.libreoffice.org/check.php
-            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
+            ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt
             ADDSYSTEMINTEGRATION 1
             PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
             PACKAGEREVISION {buildid}
@@ -106,7 +106,7 @@ LibreOffice_Dev
             SOLSUREPACKAGEPREFIX libreofficedev
             REGISTRYLAYERNAME LayerDev
             UPDATEURL http://update.libreoffice.org/check.php
-            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
+            ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt
             ADDSYSTEMINTEGRATION 1
             PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
             PACKAGEREVISION {buildid}
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index 662069532fe0..261bd19d6d86 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -542,13 +542,13 @@ sub add_variables_from_inc_to_hashref
     {
         $includefilename =~ s/^\s*//;
         $includefilename =~ s/\s*$//;
-        $includefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$includefilename, $includepatharrayref, 1);
-        if ( $$includefilenameref eq "" ) { installer::exiter::exit_program("Include file $includefilename not found!\nADD_INCLUDE_FILES = $allvariables->{'ADD_INCLUDE_FILES'}", "add_variables_from_inc_to_hashref"); }
+        $includefilenameref = $ENV{'SRCDIR'} . "/" . $includefilename;
+        if ( ! -f $includefilenameref ) { installer::exiter::exit_program("Include file $includefilename ($includefilenameref) not found!\nADD_INCLUDE_FILES = $allvariables->{'ADD_INCLUDE_FILES'}", "add_variables_from_inc_to_hashref"); }
 
-        $infoline = "Including inc file: $$includefilenameref \n";
+        $infoline = "Including inc file: $includefilenameref \n";
         push( @installer::globals::globallogfileinfo, $infoline);
 
-        my $includefile = installer::files::read_file($$includefilenameref);
+        my $includefile = installer::files::read_file($includefilenameref);
 
         for ( my $j = 0; $j <= $#{$includefile}; $j++ )
         {
diff --git a/unoil/Module_unoil.mk b/unoil/Module_unoil.mk
index f6bdc70e9ae0..5977368f2dab 100644
--- a/unoil/Module_unoil.mk
+++ b/unoil/Module_unoil.mk
@@ -9,10 +9,6 @@
 
 $(eval $(call gb_Module_Module,unoil))
 
-$(eval $(call gb_Module_add_targets,unoil,\
-    Package_clioootypesversion \
-))
-
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,unoil,\
     CustomTarget_javamaker \
diff --git a/unoil/Package_clioootypesversion.mk b/unoil/Package_clioootypesversion.mk
deleted file mode 100644
index 5ca871afa0cc..000000000000
--- a/unoil/Package_clioootypesversion.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,unoil_clioootypesversion,$(SRCDIR)/unoil/climaker))
-
-$(eval $(call gb_Package_set_outdir,unoil_clioootypesversion,$(OUTDIR)))
-
-$(eval $(call gb_Package_add_file,unoil_clioootypesversion,bin/clioootypesversion.mk,version.txt))
-
-# vim:set noet sw=4 ts=4: