summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2019-04-03 11:40:10 +0200
committerAndras Timar <andras.timar@collabora.com>2021-03-30 16:33:41 +0200
commit94900822f256ce3368f46ad82e490301a35aa3af (patch)
treeaf90d524661a5406ab5f687b1d94b69af5d349e6 /instsetoo_native
parentb1e50bd689f2f8d3f5715787c087d9f723eadb48 (diff)
[cp] license file locations for install sets
License files can be in SRCDIR ({licensepath}). In fact we set {licensepath} in solenv/bin/modules/installer/environment.pm: my $licensepath = $environment->{'SRCDIR'} . $installer::globals::separator . "readlicense_oo/license"; For example EULA_en-US.rtf is taken from here in Collabora Office. Generated license files, such as LICENSE in text format for Linux packaging are located in {customtargetpath}/readlicense_oo/license Change-Id: Ieb1f3f4f1673ed8a2b2e975bbce928a8005182e1
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/util/openoffice.lst.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 7ae52f3fa931..232c4b5a1309 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -77,7 +77,7 @@ CollaboraOffice
downloadname CollaboraOffice_{productversion}_{os}_install_{languages}
langpackdownloadname CollaboraOffice_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname CollaboraOffice_{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,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath}
+ include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{customtargetpath}/readlicense_oo/license,{packinfopath}
}
}
@@ -127,7 +127,7 @@ LibreOfficeDev
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,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath}
+ include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{customtargetpath}/readlicense_oo/license,{packinfopath}
}
}
@@ -164,7 +164,7 @@ LibreOffice_SDK
active 1
compression 5
script sdkoo
- include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath}
+ include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{customtargetpath}/readlicense_oo/license,{packinfopath}
}
}
@@ -208,6 +208,6 @@ LibreOfficeDev_SDK
active 1
compression 5
script sdkoo
- include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath}
+ include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{customtargetpath}/readlicense_oo/license,{packinfopath}
}
}