Skip to content

C
core
Kaydet (Commit) 862b9390 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

setup_native: find all static files in source/packinfo 

... and move the OSX specific files there too so we don't need several
include paths.

Change-Id: I9368e12d4cf85da3795939b51540eaf7f5d0a7d3
üst ded43f72
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 26 deletions
instsetoo_native/util/openoffice.lst.in
Dosyayı görüntüle @ 862b9390
......@@ -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 {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir}
include {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{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 {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir}
include {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
}
}
......@@ -170,7 +170,7 @@ LibreOffice_SDK
active 1
compression 5
script sdkoo
include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib
include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
}
}
......@@ -216,6 +216,6 @@ LibreOffice_Dev_SDK
active 1
compression 5
script sdkoo
include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib
include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath}
}
}
setup_native/Package_misc.mk
Dosyayı görüntüle @ 862b9390
......@@ -11,10 +11,6 @@ $(eval $(call gb_Package_Package,setup_native/misc,$(SRCDIR)/setup_native/source
$(eval $(call gb_Package_set_outdir,setup_native/misc,$(OUTDIR)))
$(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store,mac/ooo/DS_Store))
$(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store_Dev,mac/ooo/DS_Store_Dev))
$(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store_Langpack,mac/ooo/DS_Store_Langpack))
$(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/osxdndinstall.png,mac/ooo/osxdndinstall.png))
$(eval $(call gb_Package_add_file,setup_native/misc,bin/desktophelper.txt,win32/desktophelper.txt))
# vim: set noet sw=4 ts=4:
setup_native/Package_packinfo.mk
Dosyayı görüntüle @ 862b9390
......@@ -11,24 +11,6 @@ $(eval $(call gb_Package_Package,setup_native/packinfo,$(SRCDIR)/setup_native/so
$(eval $(call gb_Package_set_outdir,setup_native/packinfo,$(OUTDIR)))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/solariscopyrightfile,solariscopyrightfile))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/linuxcopyrightfile,linuxcopyrightfile))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/libreoffice.pcp,libreoffice.pcp))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/openofficelanguagepack.pcp,openofficelanguagepack.pcp))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/ure.pcp,ure.pcp))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/finals_instsetoo.txt,finals_instsetoo.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/package.txt,package.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/package_names.txt,package_names.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/package_names_ext.txt,package_names_ext.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_accessories.txt,packinfo_accessories.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_brand.txt,packinfo_brand.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_extensions.txt,packinfo_extensions.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_office.txt,packinfo_office.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_office_help.txt,packinfo_office_help.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_office_lang.txt,packinfo_office_lang.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_sdkoo.txt,packinfo_sdkoo.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_ure.txt,packinfo_ure.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/shellscripts_module.txt,shellscripts_module.txt))
$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/spellchecker_selection.txt,spellchecker_selection.txt))
# vim: set noet sw=4 ts=4:
solenv/bin/modules/installer/control.pm
Dosyayı görüntüle @ 862b9390
......@@ -271,6 +271,7 @@ sub check_system_environment
LOCAL_OUT
LOCAL_COMMON_OUT
WORKDIR
SRCDIR
);
for my $key ( @environmentvariables )
......
solenv/bin/modules/installer/environment.pm
Dosyayı görüntüle @ 862b9390
......@@ -70,6 +70,9 @@ sub create_pathvariables
my $filelistpath = $environment->{'WORKDIR'};
$variables{'filelistpath'} = $filelistpath;
my $packinfopath = $environment->{'SRCDIR'} . $installer::globals::separator . "setup_native/source/packinfo";
$variables{'packinfopath'} = $packinfopath;
return \%variables;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment