instsetoo_native: shouldn't need instdir in include path

get_Source_Directory_For_Files_From_Includepathlist already
has a special hack to find all the files in instdir so ideally it should
not be necessary to put these directories on the include path.

Clean up readlicense_oo to make that possible; also copying license.txt
as-is to LICENSE on Unix but first converting it on WNT is rather silly...

Change-Id: I95f30bc5e0b7ca73c50156a7ce0131640185778c
Reviewed-on: https://gerrit.libreoffice.org/6613
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

10 files changed, 20 insertions, 18 deletions

diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 941601f72014..0b07ebd9d897 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -78,7 +78,7 @@ LibreOffice
         downloadname    LibreOffice_{productversion}_{os}_install_{languages}
         langpackdownloadname    LibreOffice_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    LibreOffice_{productversion}_helppack_{os}_install_{languages}
-        include         {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{instdir},{instdir}/LibreOffice.app/Contents,{instdir}/ure/lib,{extensionsdir},{packinfopath}
+        include         {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{extensionsdir},{licensepath},{packinfopath}
     }
 }
 
@@ -131,7 +131,7 @@ LibreOffice_Dev
         downloadname    LibreOfficeDev_{productversion}_{os}_install_{languages}
         langpackdownloadname    LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
-        include         {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{instdir},{instdir}/LibreOffice_Dev.app/Contents,{instdir}/ure/lib,{extensionsdir},{packinfopath}
+        include         {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{extensionsdir},{licensepath},{packinfopath}
     }
 }
 
@@ -170,7 +170,7 @@ LibreOffice_SDK
         active 1
         compression 5
         script sdkoo
-        include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
+        include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath}
     }
 }
 
@@ -216,6 +216,6 @@ LibreOffice_Dev_SDK
         active 1
         compression 5
         script sdkoo
-        include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
+        include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath}
     }
 }
diff --git a/odk/Package_share_readme.mk b/odk/Package_share_readme.mk
index a73d1e9170ca..558bdd5cb84d 100644
--- a/odk/Package_share_readme.mk
+++ b/odk/Package_share_readme.mk
@@ -12,12 +12,12 @@ $(eval $(call gb_Package_Package,odk_share_readme,$(SRCDIR)))
 $(eval $(call gb_Package_set_outdir,odk_share_readme,$(INSTDIR)))
 
 $(eval $(call gb_Package_add_files,odk_share_readme,$(SDKDIRNAME)/share/readme,\
-	readlicense_oo/html/LICENSE.html \
+	readlicense_oo/license/LICENSE.html \
 ))
 
+# for WNT see Package_share_readme_generated.mk
 ifneq ($(OS),WNT)
-# the stupid thing is renamed, see Package_files.mk
-$(eval $(call gb_Package_add_file,odk_share_readme,$(SDKDIRNAME)/share/readme/LICENSE,readlicense_oo/txt/license.txt))
+$(eval $(call gb_Package_add_file,odk_share_readme,$(SDKDIRNAME)/share/readme/LICENSE,readlicense_oo/license/LICENSE))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/CustomTarget_license.mk b/readlicense_oo/CustomTarget_license.mk
index f6647efa1439..653f1dd38541 100644
--- a/readlicense_oo/CustomTarget_license.mk
+++ b/readlicense_oo/CustomTarget_license.mk
@@ -14,7 +14,7 @@ readlicense_oo_DIR := $(call gb_CustomTarget_get_workdir,readlicense_oo/license)
 $(call gb_CustomTarget_get_target,readlicense_oo/license) : $(readlicense_oo_DIR)/license.txt
 
 $(readlicense_oo_DIR)/license.txt : \
-		$(SRCDIR)/readlicense_oo/txt/license.txt \
+		$(SRCDIR)/readlicense_oo/license/LICENSE \
 		| $(readlicense_oo_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AWK,1)
 	$(call gb_Helper_abbreviate_dirs, \
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index 74fac2759b56..2c0d6d619afd 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -7,17 +7,19 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,readlicense_oo_files,$(SRCDIR)/readlicense_oo))
+$(eval $(call gb_Package_Package,readlicense_oo_files,$(SRCDIR)/readlicense_oo/license))
 
-# LICENSE (upper case) is copied without EOL conversion from license.txt
+# LICENSE (upper case) is copied without EOL conversion
 # license.txt is converted, prior to copy, see Package_license.mk
-$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE,txt/license.txt))
+ifneq ($(OS),WNT)
+$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE,LICENSE))
+endif
 
-$(eval $(call gb_Package_add_file,readlicense_oo_files,NOTICE,txt/NOTICE))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,NOTICE,NOTICE))
 
-$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.odt,odt/LICENSE.odt))
-$(eval $(call gb_Package_add_file,readlicense_oo_files,CREDITS.odt,odt/CREDITS.odt))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.odt,LICENSE.odt))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,CREDITS.odt,CREDITS.odt))
 
-$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.html,html/LICENSE.html))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.html,LICENSE.html))
 
 # vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/odt/CREDITS.odt b/readlicense_oo/license/CREDITS.odt
index 2fae5541a03b..2fae5541a03b 100644
--- a/readlicense_oo/odt/CREDITS.odt
+++ b/readlicense_oo/license/CREDITS.odt
diff --git a/readlicense_oo/txt/license.txt b/readlicense_oo/license/LICENSE
index 0a08db1e6e2b..0a08db1e6e2b 100644
--- a/readlicense_oo/txt/license.txt
+++ b/readlicense_oo/license/LICENSE
diff --git a/readlicense_oo/html/LICENSE.html b/readlicense_oo/license/LICENSE.html
index e77c6c4f41a0..e77c6c4f41a0 100644
--- a/readlicense_oo/html/LICENSE.html
+++ b/readlicense_oo/license/LICENSE.html
diff --git a/readlicense_oo/odt/LICENSE.odt b/readlicense_oo/license/LICENSE.odt
index c2d49063f4bb..c2d49063f4bb 100644
--- a/readlicense_oo/odt/LICENSE.odt
+++ b/readlicense_oo/license/LICENSE.odt
diff --git a/readlicense_oo/txt/NOTICE b/readlicense_oo/license/NOTICE
index 0a4bc388c2dd..0a4bc388c2dd 100644
--- a/readlicense_oo/txt/NOTICE
+++ b/readlicense_oo/license/NOTICE
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index cdabfd50ace1..cce32e4ab746 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -52,9 +52,6 @@ sub create_pathvariables
     my $platformname  = $environment->{'OUTPATH'};
     $variables{'platformname'} = $platformname;
 
-    my $instdir = $ENV{'INSTROOT'};
-    $variables{'instdir'} = $instdir;
-
     my $installscriptdir = $environment->{'WORKDIR'} . $installer::globals::separator . "InstallScriptTarget";
     $variables{'installscriptdir'} = $installscriptdir;
 
@@ -67,6 +64,9 @@ sub create_pathvariables
     my $filelistpath = $environment->{'WORKDIR'};
     $variables{'filelistpath'} = $filelistpath;
 
+    my $licensepath = $environment->{'SRCDIR'} . $installer::globals::separator . "readlicense_oo/license";
+    $variables{'licensepath'} = $licensepath;
+
     my $packinfopath = $environment->{'SRCDIR'} . $installer::globals::separator . "setup_native/source/packinfo";
     $variables{'packinfopath'} = $packinfopath;