native0: #161646# new parameter for unopkg
This commit is contained in:
parent
dd90371898
commit
19c60d1cd5
4 changed files with 7 additions and 7 deletions
|
@ -1071,7 +1071,7 @@ sub register_one_extension
|
||||||
$executable = "./" . $executable;
|
$executable = "./" . $executable;
|
||||||
}
|
}
|
||||||
|
|
||||||
my $systemcall = $executable . " add --shared --verbose " . "\"" . $localextension . "\"" . " -env:UserInstallation=file://" . $temppath . " 2\>\&1 |";
|
my $systemcall = $executable . " add --shared --verbose --suppress-license " . "\"" . $localextension . "\"" . " -env:UserInstallation=file://" . $temppath . " 2\>\&1 |";
|
||||||
|
|
||||||
print "... $systemcall\n";
|
print "... $systemcall\n";
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,7 @@ done
|
||||||
echo
|
echo
|
||||||
|
|
||||||
for i in $FILELIST; do
|
for i in $FILELIST; do
|
||||||
COMMAND="$UNOPKG add --shared $i"
|
COMMAND="$UNOPKG add --shared --suppress-license $i"
|
||||||
echo $COMMAND
|
echo $COMMAND
|
||||||
$COMMAND
|
$COMMAND
|
||||||
done
|
done
|
||||||
|
|
|
@ -38,7 +38,7 @@ fi
|
||||||
if [ -x $$POSTRUN ]; then
|
if [ -x $$POSTRUN ]; then
|
||||||
( echo "test -x \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" || exit 0"
|
( echo "test -x \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" || exit 0"
|
||||||
echo "umask 022"
|
echo "umask 022"
|
||||||
echo "\"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" add --shared --bundled \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}\" \"-env:UserInstallation=file:////$$INSTDIR\" '-env:UNO_JAVA_JFW_INSTALL_DATA=\$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'"
|
echo "\"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" add --shared --suppress-license --bundled \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}\" \"-env:UserInstallation=file:////$$INSTDIR\" '-env:UNO_JAVA_JFW_INSTALL_DATA=\$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'"
|
||||||
) | $$POSTRUN -b -c UNOPKG
|
) | $$POSTRUN -b -c UNOPKG
|
||||||
if [ "$$?" != "0" ]; then
|
if [ "$$?" != "0" ]; then
|
||||||
echo "\nERROR: Installation of UNO extension ${OXTFILENAME}"
|
echo "\nERROR: Installation of UNO extension ${OXTFILENAME}"
|
||||||
|
@ -47,7 +47,7 @@ if [ -x $$POSTRUN ]; then
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# No postrun available, try running unopkg directly
|
# No postrun available, try running unopkg directly
|
||||||
"$$UNOPKG" add --shared --bundled "$$BASEDIR/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
|
"$$UNOPKG" add --shared --suppress-license --bundled "$$BASEDIR/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
|
||||||
if [ "$$?" != "0" ]; then
|
if [ "$$?" != "0" ]; then
|
||||||
echo "\nERROR: Installation of UNO extension ${OXTFILENAME} failed."
|
echo "\nERROR: Installation of UNO extension ${OXTFILENAME} failed."
|
||||||
test "$$BASEDIR" = "$$CLIENT_BASEDIR" || echo "ERROR: alternate root install requires SUNWpostrun package to be installed"
|
test "$$BASEDIR" = "$$CLIENT_BASEDIR" || echo "ERROR: alternate root install requires SUNWpostrun package to be installed"
|
||||||
|
@ -176,7 +176,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -x "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" ]; then
|
if [ -x "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" ]; then
|
||||||
"$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" add --shared --shared "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}" "-env:UserInstallation=file://////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
|
"$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" add --shared --suppress-license --shared "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}" "-env:UserInstallation=file://////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$$INSTDIR" ]; then
|
if [ -n "$$INSTDIR" ]; then
|
||||||
|
@ -299,7 +299,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -x "PRODUCTDIRECTORYNAME/program/unopkg" ]; then
|
if [ -x "PRODUCTDIRECTORYNAME/program/unopkg" ]; then
|
||||||
"PRODUCTDIRECTORYNAME/program/unopkg" add --shared --bundled "PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}" "-env:UserInstallation=file://////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
|
"PRODUCTDIRECTORYNAME/program/unopkg" add --shared --suppress-license --bundled "PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}" "-env:UserInstallation=file://////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$$INSTDIR" ]
|
if [ -n "$$INSTDIR" ]
|
||||||
|
|
|
@ -351,7 +351,7 @@ extern "C" UINT __stdcall RegisterExtensions(MSIHANDLE handle)
|
||||||
{
|
{
|
||||||
const std::_tstring sTempFolder(createTempFolder());
|
const std::_tstring sTempFolder(createTempFolder());
|
||||||
std::_tstring sOxtFile = sShareInstallDir + aFindFileData.cFileName;
|
std::_tstring sOxtFile = sShareInstallDir + aFindFileData.cFileName;
|
||||||
std::_tstring sCommandPart1 = sUnoPkgFile + " add --shared --bundled " + "\"" + sOxtFile + "\"";
|
std::_tstring sCommandPart1 = sUnoPkgFile + " add --shared --suppress-license --bundled " + "\"" + sOxtFile + "\"";
|
||||||
std::_tstring sCommand = sCommandPart1
|
std::_tstring sCommand = sCommandPart1
|
||||||
+ TEXT(" -env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml")
|
+ TEXT(" -env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml")
|
||||||
+ TEXT(" -env:UserInstallation=") + sTempFolder;
|
+ TEXT(" -env:UserInstallation=") + sTempFolder;
|
||||||
|
|
Loading…
Reference in a new issue