Author: damjan Date: Sat Feb 17 08:22:00 2018 New Revision: 1824571 URL: http://svn.apache.org/viewvc?rev=1824571&view=rev Log: If LibreOffice is installed, it's incompatible "unopkg" tool will be in $PATH, causing the build to break in main/instsetoo_native as that tool lacks our "sync" option. Refer to our own unopkg using its absolute path to avoid this problem.
Patch by: me Modified: openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm Modified: openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm?rev=1824571&r1=1824570&r2=1824571&view=diff ============================================================================== --- openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm (original) +++ openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm Sat Feb 17 08:22:00 2018 @@ -123,7 +123,7 @@ sub register_extensions if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); } - my $systemcall = $unopkgfile . " sync --verbose" . " -env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 |"; + my $systemcall = $programdir . $installer::globals::separator . $unopkgfile . " sync --verbose" . " -env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 |"; $installer::logger::Info->printf("... %s ...\n", $systemcall);