dev/null |binary
instsetoo_native/util/openoffice.lst.in | 8
odk/Package_share_readme.mk | 6
readlicense_oo/CustomTarget_license.mk | 2
readlicense_oo/Package_files.mk | 16
readlicense_oo/html/LICENSE.html | 9549 ----------------------------
readlicense_oo/license/CREDITS.odt |binary
readlicense_oo/license/LICENSE | 9346 +++++++++++++++++++++++++++
readlicense_oo/license/LICENSE.html | 9549 ++++++++++++++++++++++++++++
readlicense_oo/license/LICENSE.odt |binary
readlicense_oo/license/NOTICE | 159
readlicense_oo/txt/NOTICE | 159
readlicense_oo/txt/license.txt | 9346 ---------------------------
solenv/bin/modules/installer/environment.pm | 9
14 files changed, 19074 insertions(+), 19075 deletions(-)
New commits:
commit 7b3133ad882b24834f87b478d00bf4ee92d3cd63
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Nov 7 12:58:33 2013 +0100
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 <ger...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index 941601f..0b07ebd 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 a73d1e9..558bdd5 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 f6647ef..653f1dd 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 74fac27..2c0d6d6 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
similarity index 100%
rename from readlicense_oo/odt/CREDITS.odt
rename to readlicense_oo/license/CREDITS.odt
diff --git a/readlicense_oo/txt/license.txt b/readlicense_oo/license/LICENSE
similarity index 100%
rename from readlicense_oo/txt/license.txt
rename to readlicense_oo/license/LICENSE
diff --git a/readlicense_oo/html/LICENSE.html
b/readlicense_oo/license/LICENSE.html
similarity index 100%
rename from readlicense_oo/html/LICENSE.html
rename to readlicense_oo/license/LICENSE.html
diff --git a/readlicense_oo/odt/LICENSE.odt b/readlicense_oo/license/LICENSE.odt
similarity index 100%
rename from readlicense_oo/odt/LICENSE.odt
rename to readlicense_oo/license/LICENSE.odt
diff --git a/readlicense_oo/txt/NOTICE b/readlicense_oo/license/NOTICE
similarity index 100%
rename from readlicense_oo/txt/NOTICE
rename to readlicense_oo/license/NOTICE
diff --git a/solenv/bin/modules/installer/environment.pm
b/solenv/bin/modules/installer/environment.pm
index cdabfd5..cce32e4 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;
commit 2203611500f1fdeb63ed1fd1dfedbdb11dec968e
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Nov 8 00:26:38 2013 +0100
installer: remove (now unnecessary) shlxthdlpath
Change-Id: Ic84cdc33f470ce3ed143d86add04a422f8b9e365
Reviewed-on: https://gerrit.libreoffice.org/6614
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index 0d11f86..941601f 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,{shlxthdlpath},{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,{instdir},{instdir}/LibreOffice.app/Contents,{instdir}/ure/lib,{extensionsdir},{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,{shlxthdlpath},{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,{instdir},{instdir}/LibreOffice_Dev.app/Contents,{instdir}/ure/lib,{extensionsdir},{packinfopath}
}
}
diff --git a/solenv/bin/modules/installer/environment.pm
b/solenv/bin/modules/installer/environment.pm
index ab0d877..cdabfd5 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -33,9 +33,6 @@ sub create_pathvariables
# The following variables are needed in the path file list
# solarenvpath, os, pmiscpath
- my $shlxthdlpath = $ENV{'INSTDIR'} . $installer::globals::separator .
"program" . $installer::globals::separator . "shlxthdl";
- $variables{'shlxthdlpath'} = $shlxthdlpath;
-
$variables{'os'} = $installer::globals::compiler;
my $solarenvpath = "";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
