Kaydet (Commit) 8bae88b1 authored tarafından David Tardon's avatar David Tardon

look for find-requires-gnome.sh in the right path

... and make sure it exists as well.

Change-Id: Ia895d93d2755a2b0b9d87601ace54ee47b5c1b80
üst b0c43257
...@@ -29,6 +29,11 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\ ...@@ -29,6 +29,11 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \
$(SOLARENV)/bin/make_installer.pl \ $(SOLARENV)/bin/make_installer.pl \
$(foreach ulf,$(instsetoo_ULFLIST),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \ $(foreach ulf,$(instsetoo_ULFLIST),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \
$(if $(filter-out WNT,$(OS)),\
$(addprefix $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/,\
bin/find-requires-gnome.sh \
bin/find-requires-x11.sh) \
) \
$(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-%.sh: $(SRCDIR)/instsetoo_native/inc_openoffice/unix/find-requires-%.sh $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-%.sh: $(SRCDIR)/instsetoo_native/inc_openoffice/unix/find-requires-%.sh
......
...@@ -1702,7 +1702,7 @@ sub prepare_packages ...@@ -1702,7 +1702,7 @@ sub prepare_packages
if ( $installer::globals::isrpmbuild ) if ( $installer::globals::isrpmbuild )
{ {
set_topdir_in_specfile($changefile, $filename, $newepmdir); set_topdir_in_specfile($changefile, $filename, $newepmdir);
set_autoprovreq_in_specfile($changefile, $onepackage->{'findrequires'}, "$installer::globals::unpackpath" . "/bin"); set_autoprovreq_in_specfile($changefile, $onepackage->{'findrequires'}, "$installer::globals::workpath" . "/bin");
set_packager_in_specfile($changefile); set_packager_in_specfile($changefile);
if ( is_extension_package($changefile) ) { set_prereq_in_specfile($changefile); } if ( is_extension_package($changefile) ) { set_prereq_in_specfile($changefile); }
set_license_in_specfile($changefile, $variableshashref); set_license_in_specfile($changefile, $variableshashref);
......
...@@ -59,6 +59,8 @@ BEGIN ...@@ -59,6 +59,8 @@ BEGIN
$ismacbuild = 0; $ismacbuild = 0;
$ismacdmgbuild = 0; $ismacdmgbuild = 0;
$unpackpath = ""; $unpackpath = "";
$workpath = ""; # installation working dir; some helper scripts are
# placed here by gbuild
$idttemplatepath = ""; $idttemplatepath = "";
$idtlanguagepath = ""; $idtlanguagepath = "";
$buildid = "Not set"; $buildid = "Not set";
......
...@@ -349,6 +349,11 @@ sub setglobalvariables ...@@ -349,6 +349,11 @@ sub setglobalvariables
$installer::globals::unpackpath = cwd(); $installer::globals::unpackpath = cwd();
} }
if ($installer::globals::workpath eq "") # workpath not set
{
$installer::globals::workpath = cwd();
}
if ( $installer::globals::localunpackdir ne "" ) { $installer::globals::unpackpath = $installer::globals::localunpackdir; } if ( $installer::globals::localunpackdir ne "" ) { $installer::globals::unpackpath = $installer::globals::localunpackdir; }
if (!($installer::globals::unpackpath eq "")) if (!($installer::globals::unpackpath eq ""))
......
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