diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-10 15:52:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-10 16:03:28 +0200 |
| commit | 6dcb3d4ef46312729bb6f16c473b433474863f68 (patch) | |
| tree | 58f2f577d9883e32b886bbe4086f83d0bb16fc81 | |
| parent | f2f3703740f65b76e891ecc3591d7e60d5b7caef (diff) | |
Related fdo#51252: No more prereg, no more unopkg sync
Now that 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
share/prereg/bundled to avoid startup crashes" removed the use of share/prereg,
there is no longer need to generate it in the first place (by calling "unopkg
sync" at build or installation time), and so no need for the "unopkg sync" sub-
command, either. This also allows to simplify some of the jvmfwk code that was
only there so that "unopkg sync" (which can require a JVM) can work in "hostile"
environments (during build and installation).
Change-Id: I52657384f4561bf27948ba4f0f88f4498e90987f
59 files changed, 44 insertions, 2247 deletions
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 84d8f81e585c..799edc235354 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -37,7 +37,6 @@ buildrcs: echo 'URE_MORE_TYPES=file:///assets/ure/share/misc/types.rdb file:///assets/program/types/types.rdb' >> assets/program/fundamentalrc echo 'URE_MORE_SERVICES= <$$BRAND_BASE_DIR/program/services>*' >> assets/program/fundamentalrc echo 'BUNDLED_EXTENSIONS=$$BRAND_BASE_DIR/share/extensions' >> assets/program/fundamentalrc - echo 'BUNDLED_EXTENSIONS_PREREG=$$BRAND_BASE_DIR/share/prereg/bundled' >> assets/program/fundamentalrc echo 'BUNDLED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/bundled' >> assets/program/fundamentalrc echo 'TMP_EXTENSIONS=$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/tmp' >> assets/program/fundamentalrc echo 'SHARED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/shared' >> assets/program/fundamentalrc diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists index 98b3d80fd14e..8bae44286b7b 100755 --- a/bin/distro-install-file-lists +++ b/bin/distro-install-file-lists @@ -554,7 +554,6 @@ if test "z$RPM_CONFIG_FILE_TAGS" != "z" ; then -e "s|^($INSTALLDIR/program/[a-zA-Z0-9_\.]*rc)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \ -e "s|^($INSTALLDIR/program/.*\.xsl)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \ -e "s|^($INSTALLDIR/share/config/[a-zA-Z0-9]*rc)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \ - -e "s|^($INSTALLDIR/share/config/javasettingsunopkginstall.xml)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \ -e "s|^($INSTALLDIR/share/dict/ooo/.*\.lst)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \ -e "s|^($INSTALLDIR/share/psprint/.*\.conf)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \ -e "s|^($INSTALLDIR/share/registry/.*\.xcu)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \ diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 9856d191b68f..4bb36bbfd887 100755 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -64,27 +64,18 @@ esac #collect all bootstrap variables specified on the command line #so that they can be passed as arguments to javaldx later on -#Recognize the "sync" option. sync must be applied without any other -#options except bootstrap variables or the verbose option for arg in $@ do case "$arg" in -env:*) BOOTSTRAPVARS=$BOOTSTRAPVARS" ""$arg";; - sync) OPTSYNC=true;; -v) VERBOSE=true;; --verbose) VERBOSE=true;; - *) OPTOTHER=$arg;; esac done -if [ "$OPTSYNC" = "true" ] && [ -z "$OPTOTHER" ] -then - JVMFWKPARAMS='-env:UNO_JAVA_JFW_INSTALL_DATA=$BRAND_BASE_DIR/share/config/javasettingsunopkginstall.xml -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' -fi - # extend the ld_library_path for java: javaldx checks the sofficerc for us if [ -x "$sd_prog/../ure-link/bin/javaldx" ] ; then - my_path=`"$sd_prog/../ure-link/bin/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \ + my_path=`"$sd_prog/../ure-link/bin/javaldx" $BOOTSTRAPVARS \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` if [ -n "$my_path" ] ; then sd_platform=`uname -s` @@ -110,6 +101,6 @@ unset XENVIRONMENT # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS # execute binary -exec "$sd_prog/unopkg.bin" "$@" $JVMFWKPARAMS \ +exec "$sd_prog/unopkg.bin" "$@" \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc" diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index eaa8bbb00081..c0bc0edd938c 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -148,10 +148,6 @@ namespace desktop static oslSignalHandler pSignalHandler = 0; static sal_Bool _bCrashReporterEnabled = sal_True; -#ifndef ANDROID -static ::rtl::OUString getBrandSharePreregBundledPathURL(); -#endif - namespace { void removeTree(OUString const & url) { @@ -513,246 +509,6 @@ rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr ) return sRet; } -static const char pLastSyncFileName[] = "lastsynchronized"; -static const sal_Int32 nStrLenLastSync = 16; - -#ifndef ANDROID - -static bool needsSynchronization( - ::rtl::OUString const & baseSynchronizedURL, ::rtl::OUString const & userSynchronizedURL ) -{ - bool bNeedsSync( false ); - - ::osl::DirectoryItem itemUserFile; - ::osl::File::RC err1 = - ::osl::DirectoryItem::get(userSynchronizedURL, itemUserFile); - - //If it does not exist, then there is nothing to be done - if (err1 == ::osl::File::E_NOENT) - { - return true; - } - else if (err1 != ::osl::File::E_None) - { - OSL_FAIL("Cannot access lastsynchronized in user layer"); - return true; //sync just in case - } - - //If last synchronized does not exist in base layer, then do nothing - ::osl::DirectoryItem itemBaseFile; - ::osl::File::RC err2 = ::osl::DirectoryItem::get(baseSynchronizedURL, itemBaseFile); - if (err2 == ::osl::File::E_NOENT) - { - return true; - - } - else if (err2 != ::osl::File::E_None) - { - OSL_FAIL("Cannot access file lastsynchronized in base layer"); - return true; //sync just in case - } - - //compare the modification time of the extension folder and the last - //modified file - ::osl::FileStatus statUser(osl_FileStatus_Mask_ModifyTime); - ::osl::FileStatus statBase(osl_FileStatus_Mask_ModifyTime); - if (itemUserFile.getFileStatus(statUser) == ::osl::File::E_None) - { - if (itemBaseFile.getFileStatus(statBase) == ::osl::File::E_None) - { - TimeValue timeUser = statUser.getModifyTime(); - TimeValue timeBase = statBase.getModifyTime(); - - if (timeUser.Seconds < timeBase.Seconds) - bNeedsSync = true; - } - else - { - OSL_ASSERT(0); - bNeedsSync = true; - } - } - else - { - OSL_ASSERT(0); - bNeedsSync = true; - } - - return bNeedsSync; -} - -static ::rtl::OUString getBrandSharePreregBundledPathURL() -{ - ::rtl::OUString url( - "$BRAND_BASE_DIR/share/prereg/bundled"); - - ::rtl::Bootstrap::expandMacros(url); - return url; -} - -static ::rtl::OUString getUserBundledExtPathURL() -{ - ::rtl::OUString folder( "$BUNDLED_EXTENSIONS_USER" ); - ::rtl::Bootstrap::expandMacros(folder); - - return folder; -} - -static ::rtl::OUString getLastSyncFileURLFromBrandInstallation() -{ - ::rtl::OUString aURL = getBrandSharePreregBundledPathURL(); - ::sal_Int32 nLastIndex = aURL.lastIndexOf('/'); - - ::rtl::OUStringBuffer aTmp( aURL ); - - if ( nLastIndex != aURL.getLength()-1 ) - aTmp.appendAscii( "/" ); - aTmp.appendAscii( pLastSyncFileName ); - - return aTmp.makeStringAndClear(); -} - -static ::rtl::OUString getLastSyncFileURLFromUserInstallation() -{ - ::rtl::OUString aUserBundledPathURL = getUserBundledExtPathURL(); - ::sal_Int32 nLastIndex = aUserBundledPathURL.lastIndexOf('/'); - - ::rtl::OUStringBuffer aTmp( aUserBundledPathURL ); - - if ( nLastIndex != aUserBundledPathURL.getLength()-1 ) - aTmp.appendAscii( "/" ); - aTmp.appendAscii( pLastSyncFileName ); - - return aTmp.makeStringAndClear(); -} - -#endif - -//Checks if the argument src is the folder of the help or configuration -//backend in the prereg folder -static bool excludeTmpFilesAndFolders(const rtl::OUString & src) -{ - const char helpBackend[] = "com.sun.star.comp.deployment.help.PackageRegistryBackend"; - const char configBackend[] = "com.sun.star.comp.deployment.configuration.PackageRegistryBackend"; - if (src.endsWithAsciiL(helpBackend, sizeof(helpBackend) - 1 ) - || src.endsWithAsciiL(configBackend, sizeof(configBackend) - 1)) - { - return true; - } - return false; -} - -//If we are about to copy the contents of some special folder as determined -//by excludeTmpFilesAndFolders, then we omit those files or folders with a name -//derived from temporary folders. -static bool isExcludedFileOrFolder( const rtl::OUString & name) -{ - char const * allowed[] = { - "backenddb.xml", - "configmgr.ini", - "registered_packages.db" - }; - - const unsigned int size = sizeof(allowed) / sizeof (char const *); - bool bExclude = true; - for (unsigned int i= 0; i < size; i ++) - { - ::rtl::OUString allowedName = ::rtl::OUString::createFromAscii(allowed[i]); - if (allowedName.equals(name)) - { - bExclude = false; - break; - } - } - return bExclude; -} - -static osl::FileBase::RC copy_bundled_recursive( - const rtl::OUString& srcUnqPath, - const rtl::OUString& dstUnqPath, - sal_Int32 TypeToCopy ) -throw() -{ - osl::FileBase::RC err = osl::FileBase::E_None; - - if( TypeToCopy == -1 ) // Document - { - err = osl::File::copy( srcUnqPath,dstUnqPath ); - } - else if( TypeToCopy == +1 ) // Folder - { - err = osl::Directory::create( dstUnqPath ); - osl::FileBase::RC next = err; - if( err == osl::FileBase::E_None || err == osl::FileBase::E_EXIST ) - { - err = osl::FileBase::E_None; - - osl::Directory aDir( srcUnqPath ); - bool bExcludeFiles = excludeTmpFilesAndFolders(srcUnqPath); - if (aDir.open() == osl::FileBase::E_None) - { - sal_Int32 n_Mask = osl_FileStatus_Mask_FileURL | - osl_FileStatus_Mask_FileName | - osl_FileStatus_Mask_Type; - - osl::DirectoryItem aDirItem; - while( err == osl::FileBase::E_None && ( next = aDir.getNextItem( aDirItem ) ) == osl::FileBase::E_None ) - { - sal_Bool IsDoc = false; - sal_Bool bFilter = false; - osl::FileStatus aFileStatus( n_Mask ); - aDirItem.getFileStatus( aFileStatus ); - if( aFileStatus.isValid( osl_FileStatus_Mask_Type ) ) - IsDoc = aFileStatus.getFileType() == osl::FileStatus::Regular; - - // Getting the information for the next recursive copy - sal_Int32 newTypeToCopy = IsDoc ? -1 : +1; - - rtl::OUString newSrcUnqPath; - if( aFileStatus.isValid( osl_FileStatus_Mask_FileURL ) ) - newSrcUnqPath = aFileStatus.getFileURL(); - - rtl::OUString newDstUnqPath = dstUnqPath; - rtl::OUString tit; - if( aFileStatus.isValid( osl_FileStatus_Mask_FileName ) ) - { - ::rtl::OUString aFileName = aFileStatus.getFileName(); - tit = rtl::Uri::encode( aFileName, - rtl_UriCharClassPchar, - rtl_UriEncodeIgnoreEscapes, - RTL_TEXTENCODING_UTF8 ); - - // Special treatment for "lastsychronized" file. Must not be - // copied from the bundled folder! - //Also do not copy *.tmp files and *.tmp_ folders. This affects the files/folders - //from the help and configuration backend - if ( IsDoc && (aFileName.equalsAscii( pLastSyncFileName ) - || (bExcludeFiles && isExcludedFileOrFolder(aFileName)))) - bFilter = true; - else if (!IsDoc && bExcludeFiles && isExcludedFileOrFolder(aFileName)) - bFilter = true; - } - - if( newDstUnqPath.lastIndexOf( sal_Unicode('/') ) != newDstUnqPath.getLength()-1 ) - newDstUnqPath += rtl::OUString("/"); - - newDstUnqPath += tit; - - if (( newSrcUnqPath != dstUnqPath ) && !bFilter ) - err = copy_bundled_recursive( newSrcUnqPath,newDstUnqPath, newTypeToCopy ); - } - - if( err == osl::FileBase::E_None && next != osl::FileBase::E_NOENT ) - err = next; - - aDir.close(); - } - } - } - - return err; -} - Desktop::Desktop() : m_bServicesRegistered( false ) , m_aBootstrapError( BE_OK ) @@ -774,26 +530,6 @@ void Desktop::Init() refreshBundledExtensionsDir(); - // Check for lastsynchronized file for bundled extensions in the user directory - // and test if synchronzation is necessary! -#ifndef ANDROID - { - ::rtl::OUString aUserLastSyncFilePathURL = getLastSyncFileURLFromUserInstallation(); - ::rtl::OUString aPreregSyncFilePathURL = getLastSyncFileURLFromBrandInstallation(); - - if ( needsSynchronization( aPreregSyncFilePathURL, aUserLastSyncFilePathURL )) - { - rtl::OUString aUserPath = getUserBundledExtPathURL(); - rtl::OUString aPreregBundledPath = getBrandSharePreregBundledPathURL(); - - // copy bundled folder to the user directory - osl::FileBase::RC rc = osl::Directory::createPath(aUserPath); - (void) rc; - if (false) copy_bundled_recursive( aPreregBundledPath, aUserPath, +1 ); - } - } -#endif - // We need to have service factory before going further, but see fdo#37195. // Doing this will mmap common.rdb, making it not overwritable on windows, // so this can't happen before the synchronization above. Lets rework this diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index f2a6fce0a0ff..68403f1af6cb 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -1258,64 +1258,6 @@ void ExtensionManager::reinstallDeployedExtensions( } } -/** Works on the bundled repository. That is using the variables - BUNDLED_EXTENSIONS and BUNDLED_EXTENSIONS_USER. - */ -void ExtensionManager::synchronizeBundledPrereg( - Reference<task::XAbortChannel> const & xAbortChannel, - Reference<ucb::XCommandEnvironment> const & xCmdEnv ) - throw (deploy::DeploymentException, - uno::RuntimeException) -{ - try - { - String sSynchronizingBundled(StrSyncRepository::get()); - sSynchronizingBundled.SearchAndReplaceAllAscii( "%NAME", OUSTR("bundled")); - dp_misc::ProgressLevel progressBundled(xCmdEnv, sSynchronizingBundled); - - Reference<deploy::XPackageManagerFactory> xPackageManagerFactory( - deploy::thePackageManagerFactory::get(m_xContext)); - - Reference<deploy::XPackageManager> xMgr = - xPackageManagerFactory->getPackageManager(OUSTR("bundled_prereg")); - xMgr->synchronize(xAbortChannel, xCmdEnv); - progressBundled.update(OUSTR("\n\n")); - - uno::Sequence<Reference<deploy::XPackage> > extensions = xMgr->getDeployedPackages( - xAbortChannel, xCmdEnv); - try - { - for (sal_Int32 i = 0; i < extensions.getLength(); i++) - { - extensions[i]->registerPackage(true, xAbortChannel, xCmdEnv); - } - } - catch (...) - { - OSL_ASSERT(0); - } - OUString lastSyncBundled(RTL_CONSTASCII_USTRINGPARAM( - "$BUNDLED_EXTENSIONS_PREREG/lastsynchronized")); - writeLastModified(lastSyncBundled, xCmdEnv); - - } catch ( const deploy::DeploymentException& ) { - throw; - } catch ( const ucb::CommandFailedException & ) { - throw; - } catch ( const ucb::CommandAbortedException & ) { - throw; - } catch (const lang::IllegalArgumentException &) { - throw; - } catch (const uno::RuntimeException &) { - throw; - } catch (...) { - uno::Any exc = ::cppu::getCaughtException(); - throw deploy::DeploymentException( - OUSTR("Extension Manager: exception in synchronize"), - static_cast<OWeakObject*>(this), exc); - } -} - sal_Bool ExtensionManager::synchronize( Reference<task::XAbortChannel> const & xAbortChannel, Reference<ucb::XCommandEnvironment> const & xCmdEnv ) @@ -1342,14 +1284,15 @@ sal_Bool ExtensionManager::synchronize( bModified |= getBundledRepository()->synchronize(xAbortChannel, xCmdEnv); progressBundled.update(OUSTR("\n\n")); - //Always determine the active extension. This is necessary for the - //first-start optimization. The setup creates the registration data for the - //bundled extensions (brand_layer/share/prereg/bundled), which is copied to the user - //installation (user_installation/extension/bundled) when a user starts OOo - //for the first time after running setup. All bundled extensions are registered - //at that moment. However, extensions with the same identifier can be in the - //shared or user repository, in which case the respective bundled extensions must - //be revoked. + //Always determine the active extension. + //TODO: Is this still necessary? (It used to be necessary for the + // first-start optimization: The setup created the registration data + // for the bundled extensions (share/prereg/bundled) which was copied to + // the user installation when a user started OOo for the first time + // after running setup. All bundled extensions were registered at that + // moment. However, extensions with the same identifier could be in the + // shared or user repository, in which case the respective bundled + // extensions had to be revoked.) try { const uno::Sequence<uno::Sequence<Reference<deploy::XPackage> > > diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index 800d91f437b6..0682aac1a832 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -201,12 +201,6 @@ public: css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual void SAL_CALL synchronizeBundledPrereg( - css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, - css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) - throw (css::deployment::DeploymentException, - css::uno::RuntimeException); - virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL getExtensionsWithUnacceptedLicenses( ::rtl::OUString const & repository, diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index a088f516c8a7..7d919ed52385 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -391,24 +391,6 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create( //No stamp file. We assume that bundled is always readonly. It must not be //modified from ExtensionManager but only by the installer } - else if ( context == "bundled_prereg" ) { - //This is a bundled repository but the registration data - //is in the brand layer: share/prereg - //It is special because the registration data are copied at the first startup - //into the user installation. The processed help and xcu files are not - //copied. Instead the backenddb.xml for the help backend references the help - //by using $BUNDLED_EXTENSION_PREREG instead $BUNDLED_EXTENSIONS_USER. The - //configmgr.ini also used $BUNDLED_EXTENSIONS_PREREG to refer to the xcu file - //which contain the replacement for %origin%. - that->m_activePackages = OUSTR( - "vnd.sun.star.expand:$BUNDLED_EXTENSIONS"); - that->m_registrationData = OUSTR( - "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG"); - that->m_registryCache = OUSTR( - "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG/registry"); - logFile = OUSTR( - "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG/log.txt"); - } else if ( context == "tmp" ) { that->m_activePackages = OUSTR( "vnd.sun.star.expand:$TMP_EXTENSIONS/extensions"); @@ -989,8 +971,7 @@ OUString PackageManagerImpl::getDeployPath( ActivePackages::Data const & data ) //The bundled extensions are not contained in an additional folder //with a unique name. data.temporaryName contains already the //UTF8 encoded folder name. See PackageManagerImpl::synchronize - if (!m_context.equals(OUSTR("bundled")) - && !m_context.equals(OUSTR("bundled_prereg"))) + if (!m_context.equals(OUSTR("bundled"))) { buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("_/") ); buf.append( ::rtl::Uri::encode( data.fileName, rtl_UriCharClassPchar, diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index d28e3e9c62b2..b0fb42597a43 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -735,7 +735,6 @@ void BackendImpl::PackageImpl::processPackage_( //No need for live-deployment for bundled extension, because OOo //restarts after installation if (that->m_eContext != CONTEXT_BUNDLED - && that->m_eContext != CONTEXT_BUNDLED_PREREG && !startup) { if (m_isSchema) diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 13231ec4152d..a3979bcad890 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -102,8 +102,6 @@ PackageRegistryBackend::PackageRegistryBackend( m_eContext = CONTEXT_BUNDLED; else if ( m_context == "tmp" ) m_eContext = CONTEXT_TMP; - else if ( m_context == "bundled_prereg" ) - m_eContext = CONTEXT_BUNDLED_PREREG; else if (m_context.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.tdoc:/") )) m_eContext = CONTEXT_DOCUMENT; diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index a64193293011..17c056d6443b 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -256,8 +256,7 @@ void BackendImpl::ExecutablePackageImpl::processPackage_( else if (getMyBackend()->m_context.equals(OUSTR("shared"))) attributes |= (osl_File_Attribute_OwnExe | osl_File_Attribute_GrpExe | osl_File_Attribute_OthExe); - else if (!getMyBackend()->m_context.equals(OUSTR("bundled")) - && !getMyBackend()->m_context.equals(OUSTR("bundled_prereg"))) + else if (!getMyBackend()->m_context.equals(OUSTR("bundled"))) //Bundled extension are required to be in the properly //installed. That is an executable must have the right flags OSL_ASSERT(0); @@ -286,8 +285,7 @@ bool BackendImpl::ExecutablePackageImpl::isUrlTargetInExtension() sExtensionDir = dp_misc::expandUnoRcTerm(OUSTR("$UNO_USER_PACKAGES_CACHE")); else if (getMyBackend()->m_context.equals(OUSTR("shared"))) sExtensionDir = dp_misc::expandUnoRcTerm(OUSTR("$UNO_SHARED_PACKAGES_CACHE")); - else if (getMyBackend()->m_context.equals(OUSTR("bundled")) - || getMyBackend()->m_context.equals(OUSTR("bundled_prereg"))) + else if (getMyBackend()->m_context.equals(OUSTR("bundled"))) sExtensionDir = dp_misc::expandUnoRcTerm(OUSTR("$BUNDLED_EXTENSIONS")); else OSL_ASSERT(0); diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index b4dff980aa68..d9a3e0b0bfbc 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -300,7 +300,7 @@ protected: // currently only for library containers: enum { CONTEXT_UNKNOWN, - CONTEXT_USER, CONTEXT_SHARED,CONTEXT_BUNDLED, CONTEXT_TMP, CONTEXT_BUNDLED_PREREG, + CONTEXT_USER, CONTEXT_SHARED,CONTEXT_BUNDLED, CONTEXT_TMP, CONTEXT_DOCUMENT } m_eContext; bool m_readOnly; diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index a7f5cdfa0f28..5741ccc2bea2 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -310,11 +310,6 @@ void BackendImpl::PackageImpl:: initPackageHandler() { aContext <<= OUSTR("bundled"); } - else if ( that->m_eContext == CONTEXT_BUNDLED_PREREG ) - { - aContext <<= OUSTR("bundled_prereg"); - } - else { OSL_ASSERT( 0 ); diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index 2bd4d1b99214..43faed54656a 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -374,45 +374,6 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main() if (e != osl_File_E_None && e != osl_File_E_NOENT) throw Exception(OUSTR("Could not delete ") + extensionUnorc, 0); } - else if (subCommand.equals(OUSTR("sync"))) - { - //sync is private!!!! Only to be called from setup!!! - //The UserInstallation is diverted to the prereg folder. But only - //the lock file is written! This requires that - //-env:UNO_JAVA_JFW_INSTALL_DATA is passed to javaldx and unopkg otherwise the - //javasettings file is written to the prereg folder. - // - //For performance reasons unopkg sync is called during the setup and - //creates the registration data for the repository of the bundled - //extensions. It is then copied to the user installation during - //startup of OOo (userdata/extensions/bundled). The registration - //data is in the brand installation and must be removed when - //uninstalling OOo. We do this here, before UNO is - //bootstrapped. Otherwies files could be locked by this process. - - //If there is no folder left in - //$BRAND_BASE_DIR/share/extensions - //then we can delete the registration data at - //$BUNDLED_EXTENSIONS_USER - if (hasNoFolder(OUSTR("$BRAND_BASE_DIR/share/extensions"))) - { - removeFolder(OUSTR("$BUNDLED_EXTENSIONS_PREREG")); - //return otherwise we create the registration data again - return 0; - } - //redirect the UserInstallation, so we do not create a - //user installation for the admin and we also do not need - //to call unopkg with -env:UserInstallation - ::rtl::Bootstrap::set(OUSTR("UserInstallation"), - OUSTR("$BUNDLED_EXTENSIONS_PREREG/..")); - //Setting UNO_JAVA_JFW_INSTALL_DATA causes the javasettings to be written - //in the office installation. We do not want to create the user data folder - //for the admin. The value must also be set in the unopkg script (Linux, etc.) - //when calling javaldx - ::rtl::Bootstrap::set(OUSTR("UNO_JAVA_JFW_INSTALL_DATA"), - OUSTR("$BRAND_BASE_DIR/share/config/javasettingsunopkginstall.xml")); - - } xComponentContext = getUNO( disposeGuard, option_verbose, option_shared, subcmd_gui, @@ -430,7 +391,6 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main() //prevent the deletion of the registry data folder //synching is done in XExtensionManager.reinstall if (!subcmd_gui && ! subCommand.equals(OUSTR("reinstall")) - && ! subCommand.equals(OUSTR("sync")) && ! dp_misc::office_is_running()) dp_misc::syncRepositories(xCmdEnv); @@ -621,18 +581,6 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main() xDialog->startExecuteModal(xListener); dialogEnded.wait(); } - else if ( subCommand == "sync" ) - { - if (! dp_misc::office_is_running()) - { - xExtensionManager->synchronizeBundledPrereg( - Reference<task::XAbortChannel>(), xCmdEnv); - } - else - { - dp_misc::writeConsoleError(OUSTR("\nError: office is running")); - } - } else { dp_misc::writeConsoleError( diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index c7b5e67aa155..52b4ab884a1b 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -524,112 +524,6 @@ Reference<XComponentContext> getUNO( return xComponentContext; } -//Determines if a folder does not contains a folder. -//Return false may also mean that the status could not be determined -//because some error occurred. -bool hasNoFolder(OUString const & folderUrl) -{ - bool ret = false; - OUString url = folderUrl; - ::rtl::Bootstrap::expandMacros(url); - ::osl::Directory dir(url); - osl::File::RC rc = dir.open(); - if (rc == osl::File::E_None) - { - bool bFolderExist = false; - osl::DirectoryItem i; - osl::File::RC rcNext = osl::File::E_None; - while ( (rcNext = dir.getNextItem(i)) == osl::File::E_None) - { - osl::FileStatus stat(osl_FileStatus_Mask_Type); - if (i.getFileStatus(stat) == osl::File::E_None) - { - if (stat.getFileType() == osl::FileStatus::Directory) - { - bFolderExist = true; - break; - } - } - else - { - dp_misc::writeConsole( - OUSTR("unopkg: Error while investigating ") + url + OUSTR("\n")); - break; - } - i = osl::DirectoryItem(); - } - - if (rcNext == osl::File::E_NOENT || - rcNext == osl::File::E_None) - { - if (!bFolderExist) - ret = true; - } - else - { - dp_misc::writeConsole( - OUSTR("unopkg: Error while investigating ") + url + OUSTR("\n")); - } - - dir.close(); - } - else - { - dp_misc::writeConsole( - OUSTR("unopkg: Error while investigating ") + url + OUSTR("\n")); - } - return ret; -} - -void removeFolder(OUString const & folderUrl) -{ - OUString url = folderUrl; - ::rtl::Bootstrap::expandMacros(url); - ::osl::Directory dir(url); - ::osl::File::RC rc = dir.open(); - if (rc == osl::File::E_None) - { - ::osl::DirectoryItem i; - ::osl::File::RC rcNext = ::osl::File::E_None; - while ( (rcNext = dir.getNextItem(i)) == ::osl::File::E_None) - { - ::osl::FileStatus stat(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL); - if (i.getFileStatus(stat) == ::osl::File::E_None) - { - ::osl::FileStatus::Type t = stat.getFileType(); - if (t == ::osl::FileStatus::Directory) - { - //remove folder - removeFolder(stat.getFileURL()); - } - else if (t == ::osl::FileStatus::Regular) - { - //remove file - ::osl::File::remove(stat.getFileURL()); - } - else - { - OSL_ASSERT(0); - } - } - else - { - dp_misc::writeConsole( - OUSTR("unopkg: Error while investigating ") + url + OUSTR("\n")); - break; - } - i = ::osl::DirectoryItem(); - } - dir.close(); - ::osl::Directory::remove(url); - } - else if (rc != osl::File::E_NOENT) - { - dp_misc::writeConsole( - OUSTR("unopkg: Error while removing ") + url + OUSTR("\n")); - } -} - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h index c8de646b12ce..400e2835199e 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_shared.h +++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h @@ -173,10 +173,6 @@ css::uno::Reference<css::uno::XComponentContext> getUNO( DisposeGuard & disposeGuard, bool verbose, bool shared, bool bGui, css::uno::Reference<css::uno::XComponentContext> & out_LocalComponentContext); -bool hasNoFolder(::rtl::OUString const & folderUrl); - -void removeFolder(::rtl::OUString const & folderUrl); - } diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index b0a81402aba2..9ac3c21cf87f 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -1171,8 +1171,9 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable ::rtl::OUString sVal ; aState = utl::Bootstrap::locateUserData( sVal ); - //There can be the valid case that there is no user installation. For example, "unopkg sync" - //is currently (OOo3.4) run as part of the setup. Then no user installation is required. + //There can be the valid case that there is no user installation. + //TODO: Is that still the case? (With OOo 3.4, "unopkg sync" was run as part + // of the setup. Then no user installation was required.) //Therefore we do not assert here. if( aState == ::utl::Bootstrap::PATH_EXISTS ) { aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ] = ConvertOSLtoUCBURL( sVal ); diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt index 5f34a1c2766e..dd128b2f6dcb 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt @@ -6,8 +6,6 @@ setAllUsersProfile2K 51 ALLUSERSPROFILE [%ALLUSERSPROFILE] SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users setUserProfileNT 51 USERPROFILE [%USERPROFILE] SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION] -SetInstallLocation1 51 RegisterExtensions [INSTALLLOCATION] -SetInstallLocation2 51 RemoveExtensions [INSTALLLOCATION] NewProductFound 19 OOO_CUSTOMACTION_1 SameProductFound 19 OOO_CUSTOMACTION_2 SetLanguageSelected 51 LANG_SELECTED 1 diff --git a/jvmfwk/Package_rcfiles.mk b/jvmfwk/Package_rcfiles.mk index fd5593287290..0d4c8ace65cf 100644 --- a/jvmfwk/Package_rcfiles.mk +++ b/jvmfwk/Package_rcfiles.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Package_Package,jvmfwk_rcfiles,$(SRCDIR)/jvmfwk)) -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,bin/javasettingsunopkginstall.xml,source/javasettingsunopkginstall.xml)) - # The below files (intended to be also used during the build) need to go into # the same directory as dynamic libraries (either bin or lib): diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h index 17e4766add0f..98c49c3cb3b2 100644 --- a/jvmfwk/inc/jvmfwk/framework.h +++ b/jvmfwk/inc/jvmfwk/framework.h @@ -60,30 +60,6 @@ extern "C" { <dd>The file contains settings valid for all users. If a user changes a setting then it takes precedence over the setting from UNO_JAVA_JFW_SHARED_DATA. The content of this file is an implementation detail and may change in the future.</dd> - - <dt>UNO_JAVA_JFW_INSTALL_DATA</dt> - <dd><b>DEPRECATED. Support for this variable will soon be removed.</b><br> - The file contains settings for all users. A user cannot override these settings. - When this parameter is provided then UNO_JAVA_JFW_SHARED_DATA and UNO_JAVA_JFW_USER_DATA - are irrelevant. This parameter is intended for use during the setup. For example, to - install extensions which contain java components. If there is already a file at this - location then it will be overwritten if it is too old. The period of validatity is per - default one hour. This value can be overridden by the bootstrap parameter - UNO_JAVA_JFW_INSTALL_EXPIRE (<b>DEPRECATED</b>). Setting this variable to 1000 means - the settings file is only valid for 1000 seconds. - - <p>If one would not use UNO_JAVA_JFW_INSTALL_DATA during setup then most probably - a user installation directory would be created in the home directory of root. This is - because, java settings are determined and stored on behalf of the current user. In other - words UNO_JAVA_JFW_USER_DATA would be used which points into the user installation. - </p> - <p>UNO_JAVA_JFW_INSTALL_DATA could point into the shared installation, provided that - only people with root rights can install OOo. Then one has to take care that the - installer removes this file when uninstalling. - </p> - - - The content of this file is an implementation detail and may change in the future.</dd> </dl> <p>The values for these parameters must be file URLs and include the file name, for diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 454eaec88212..aab9b6752caa 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -20,7 +20,6 @@ #include "elements.hxx" #include "osl/mutex.hxx" #include "osl/file.hxx" -#include "osl/time.h" #include "fwkutil.hxx" #include "fwkbase.hxx" #include "framework.hxx" @@ -83,16 +82,6 @@ rtl::OString getElementUpdated() (xmlChar*)"/jf:javaSelection/jf:updated/text()", true); } -// Use only in INSTALL mode !!! -rtl::OString getElementModified() -{ - //The modified element is only written in INSTALL mode. - //That is NodeJava::m_layer = INSTALL - return getElement(jfw::getInstallSettingsPath(), - (xmlChar*)"/jf:java/jf:modified/text()", false); -} - - void createSettingsStructure(xmlDoc * document, bool * bNeedsSave) { rtl::OString sExcMsg("[Java framework] Error in function createSettingsStructure " @@ -222,18 +211,6 @@ NodeJava::NodeJava(Layer layer): throw FrameworkException( JFW_E_DIRECT_MODE, "[Java framework] Trying to access settings files in direct mode."); - - if (USER_OR_INSTALL == m_layer) - { - if (!BootParams::getInstallData().isEmpty()) - m_layer = INSTALL; - else - m_layer = USER; - } - else - { - m_layer = layer; - } } @@ -255,7 +232,7 @@ void NodeJava::load() //Writing shared data is not supported yet. return; } - else if (USER == m_layer || INSTALL == m_layer) + else if (USER == m_layer) { prepareSettingsDocument(); } @@ -386,7 +363,6 @@ void NodeJava::load() switch (m_layer) { case USER: ret = getUserSettingsPath(); break; - case INSTALL: ret = getInstallSettingsPath(); break; case SHARED: ret = getSharedSettingsPath(); break; default: OSL_FAIL("[Java framework] NodeJava::getSettingsPath()"); @@ -400,7 +376,6 @@ void NodeJava::load() switch (m_layer) { case USER: ret = BootParams::getUserData(); break; - case INSTALL: ret = BootParams::getInstallData(); break; case SHARED: ret = BootParams::getSharedData(); break; default: OSL_FAIL("[Java framework] NodeJava::getSettingsURL()"); @@ -589,20 +564,6 @@ void NodeJava::write() const } } - if (INSTALL == m_layer) - { - //now write the current system time - ::TimeValue curTime = {0,0}; - if (::osl_getSystemTime(& curTime)) - { - rtl::OUString sSeconds = - rtl::OUString::valueOf((sal_Int64) curTime.Seconds); - xmlNewTextChild( - root,NULL, (xmlChar*) "modified", CXmlCharPtr(sSeconds)); - xmlNode * nodeCrLf = xmlNewText((xmlChar*) "\n"); - xmlAddChild(root, nodeCrLf); - } - } if (xmlSaveFormatFile(sSettingsPath.getStr(), docUser, 1) == -1) throw FrameworkException(JFW_E_ERROR, sExcMsg); } @@ -738,66 +699,11 @@ jfw::FileStatus NodeJava::checkSettingsFileStatus() const File::RC rc = ::osl::DirectoryItem::get(sURL, item); if (File::E_None == rc) { - ::osl::FileStatus stat( - osl_FileStatus_Mask_Validate - | osl_FileStatus_Mask_CreationTime - | osl_FileStatus_Mask_ModifyTime); + ::osl::FileStatus stat(osl_FileStatus_Mask_Validate); File::RC rc_stat = item.getFileStatus(stat); if (File::E_None == rc_stat) { - // This - //function may be called multiple times when a java is started. - //If the expiretime is too small then we may loop because everytime - //the file is deleted and we need to search for a java again. - if (INSTALL == m_layer) - { - //file exists. Check if it is too old - //Do not use the creation time. On Windows 2003 server I noticed - //that after removing the file and shortly later creating it again - //did not change the creation time. That is the newly created file - //had the creation time of the former file. - ::TimeValue curTime = {0,0}; - ret = FILE_OK; - if (sal_True == ::osl_getSystemTime(& curTime)) - { - //get the modified time recorded in the <modified> element - sal_uInt32 modified = getModifiedTime(); - OSL_ASSERT(modified <= curTime.Seconds); - //Only if modified has a valued then NodeJava::write was called, - //then the xml structure was filled with data. - - if ( modified && curTime.Seconds - modified > - BootParams::getInstallDataExpiration()) - { -#if OSL_DEBUG_LEVEL >=2 - fprintf(stderr, "[Java framework] Settings file is %d seconds old. \n", - (int)( curTime.Seconds - modified)); - rtl::OString s = rtl::OUStringToOString(sURL, osl_getThreadTextEncoding()); - fprintf(stderr, "[Java framework] Settings file is exspired. Deleting settings file at \n%s\n", s.getStr()); -#endif - //delete file - File f(sURL); - if (File::E_None == f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Read) - && File::E_None == f.setPos(0, 0) - && File::E_None == f.setSize(0)) - ret = FILE_DOES_NOT_EXIST; - else - ret = FILE_INVALID; - } - else - { - ret = FILE_OK; - } - } - else // osl_getSystemTime - { - ret = FILE_INVALID; - } - } - else // INSTALL == m_layer - { - ret = FILE_OK; - } + ret = FILE_OK; } else if (File::E_NOENT == rc_stat) { @@ -1123,17 +1029,6 @@ JavaInfo * CNodeJavaInfo::makeJavaInfo() const return pInfo; } -sal_uInt32 NodeJava::getModifiedTime() const -{ - if (m_layer != INSTALL) - { - OSL_ASSERT(0); - return 0; - } - rtl::OString modTimeSeconds = getElementModified(); - return (sal_uInt32) modTimeSeconds.toInt64(); -} - //================================================================================ MergedSettings::MergedSettings(): m_bEnabled(sal_False), @@ -1142,23 +1037,11 @@ MergedSettings::MergedSettings(): m_JRELocations(), m_javaInfo() { - NodeJava settings(NodeJava::USER_OR_INSTALL); + NodeJava settings(NodeJava::USER); settings.load(); - - //Check if UNO_JAVA_JFW_INSTALL_DATA is set. If so, then we need not use user and - //shared data. - const ::rtl::OUString sInstall = BootParams::getInstallData(); - - if (sInstall.isEmpty()) - { - NodeJava sharedSettings(NodeJava::SHARED); - sharedSettings.load(); - merge(sharedSettings, settings); - } - else - { - merge(NodeJava(), settings); - } + NodeJava sharedSettings(NodeJava::SHARED); + sharedSettings.load(); + merge(sharedSettings, settings); } MergedSettings::~MergedSettings() diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx index c35d624c900e..524efebece1b 100644 --- a/jvmfwk/source/elements.hxx +++ b/jvmfwk/source/elements.hxx @@ -105,12 +105,8 @@ public: settings file. Which settings file is used is determined by the value passed into the - constructo and the values of the bootstrap parameters UNO_JAVA_JFW_USER_DATA, - UNO_JAVA_JFW_SHARED_DATA,_JAVA_JFW_INSTALL_DATA. - - If the value is USER_OR_INSTALL then it depends of the bootstrap parameter - UNO_JAVA_JFW_INSTALL_DATA. If it has as value then it is used. Otherwise the - value from UNO_JAVA_JFW_USER_DATA is used. + constructor and the values of the bootstrap parameters + UNO_JAVA_JFW_USER_DATA and UNO_JAVA_JFW_SHARED_DATA. The method load reads the data from the settings file. The method write stores the data into the settings file. @@ -118,16 +114,15 @@ public: class NodeJava { public: - enum Layer { USER_OR_INSTALL, USER, SHARED, INSTALL }; + enum Layer { USER, SHARED }; private: /** creates settings file and fills it with default values. When this function is called then it creates the settings file at the possition determined by the bootstrap parameters - (UNO_JAVA_JFW_USER_DATA, UNO_JAVA_JFW_SHARED_DATA, - UNO_JAVA_JFW_INSTALL_DATA) and m_layer, unless the file already exists - (see createSettingsDocument). + (UNO_JAVA_JFW_USER_DATA, UNO_JAVA_JFW_SHARED_DATA) and m_layer, unless + the file already exists (see createSettingsDocument). @return JFW_E_CONFIG_READWRITE @@ -139,9 +134,8 @@ private: void createSettingsDocument() const; /** returns the system path to the data file which is to be used. The value - depends on - the the member m_layer and the bootstrap parameters UNO_JAVA_JFW_USER_DATA, - UNO_JAVA_JFW_SHARED_DATA and UNO_JAVA_JFW_INSTALL_DATA which this may be. + depends on the the member m_layer and the bootstrap parameters + UNO_JAVA_JFW_USER_DATA and UNO_JAVA_JFW_SHARED_DATA. */ ::rtl::OString getSettingsPath() const; @@ -149,9 +143,7 @@ private: */ ::rtl::OUString getSettingsURL() const; - /** Verifies if the respective settings file exist. In case UNO_JAVA_JFW_INSTALL_DATA - is used, the age is checked. If the file is too old then we assume that it does not - exist and wipe its contents. Then still FILE_DOES_NOT_EXIST is returned. + /** Verifies if the respective settings file exist. */ jfw::FileStatus checkSettingsFileStatus() const; @@ -187,37 +179,9 @@ private: */ boost::optional< ::std::vector< ::rtl::OUString> > m_JRELocations; - /** Only in INSTALL mode. Then NodeJava.write writes a <modified> element - which contains the seconds value of the TimeValue (osl/time.h), obtained - with osl_getSystemTime. - It returns 0 if the value cannot be obtained. - This is used to fix the problem that the modified time of the settings - file is incorrect because it resides on an NFS volume where the NFS - server and NFS client do not have the same system time. For example if - the server time is ahead of the client time then checkSettingsFileStatus - deleted the settings. So even if javaldx determined a Java - (jfw_findAndSelectJRE) then jfw_startVM returned a JFW_E_NO_SELECT. Then - it looked again for a java by calling jfw_findAndSelectJRE, which - returned a JFW_E_NONE. But the following jfw_startVM returned again - JFW_E_NO_SELECT. So it looped. (see issue i114509) - - NFS server and NFS client should have the same time. It is common - practise to enforce this in networks. We actually should not work - around a malconfigured network. We must however, make sure that we do - not loop. Maybe a better approach is, that: - - assume that mtime and system time are reliable - - checkSettingsFile uses system time and mtime of the settings file, - instset of using getModifiedTime. - - allow a small error margin - - jfw_startVM must return a JFW_E_EXPIRED_SETTINGS - - XJavaVM::startVM should prevent the loop by processing the new return+ value - - */ - sal_uInt32 getModifiedTime() const; - public: - NodeJava(Layer theLayer = USER_OR_INSTALL); + explicit NodeJava(Layer theLayer); /** sets m_enabled. /java/enabled@xsi:nil will be set to false when write is called. @@ -300,7 +264,6 @@ public: bootstrap variables: UNO_JAVA_JFW_USER_DATA UNO_JAVA_JFW_SHARED_DATA - UNO_JAVA_JFW_INSTALL_DATA The class also determines useful default values for settings which have not been made. */ diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 066645029136..28276b8bda5d 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -601,7 +601,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo) } if ((JavaInfo*) aCurrentInfo) { - jfw::NodeJava javaNode; + jfw::NodeJava javaNode(jfw::NodeJava::USER); javaNode.setJavaInfo(aCurrentInfo,true); javaNode.write(); @@ -862,7 +862,7 @@ javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo) if (jfw_areEqualJavaInfo(currentInfo, pInfo) == sal_False) { - jfw::NodeJava node; + jfw::NodeJava node(jfw::NodeJava::USER); node.setJavaInfo(pInfo, false); node.write(); //remember that the JRE was selected in this process @@ -898,7 +898,7 @@ javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled) if (settings.getEnabled() == sal_False) g_bEnabledSwitchedOn = true; } - jfw::NodeJava node; + jfw::NodeJava node(jfw::NodeJava::USER); node.setEnabled(bEnabled); node.write(); } @@ -943,7 +943,7 @@ javaFrameworkError SAL_CALL jfw_setVMParameters( osl::MutexGuard guard(jfw::FwkMutex::get()); if (jfw::getMode() == jfw::JFW_MODE_DIRECT) return JFW_E_DIRECT_MODE; - jfw::NodeJava node; + jfw::NodeJava node(jfw::NodeJava::USER); if (arOptions == NULL && nLen != 0) return JFW_E_INVALID_ARG; node.setVmParameters(arOptions, nLen); @@ -991,7 +991,7 @@ javaFrameworkError SAL_CALL jfw_setUserClassPath(rtl_uString * pCp) osl::MutexGuard guard(jfw::FwkMutex::get()); if (jfw::getMode() == jfw::JFW_MODE_DIRECT) return JFW_E_DIRECT_MODE; - jfw::NodeJava node; + jfw::NodeJava node(jfw::NodeJava::USER); if (pCp == NULL) return JFW_E_INVALID_ARG; node.setUserClassPath(pCp); @@ -1037,7 +1037,7 @@ javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation) osl::MutexGuard guard(jfw::FwkMutex::get()); if (jfw::getMode() == jfw::JFW_MODE_DIRECT) return JFW_E_DIRECT_MODE; - jfw::NodeJava node; + jfw::NodeJava node(jfw::NodeJava::USER); if (sLocation == NULL) return JFW_E_INVALID_ARG; node.load(); @@ -1064,7 +1064,7 @@ javaFrameworkError SAL_CALL jfw_setJRELocations( osl::MutexGuard guard(jfw::FwkMutex::get()); if (jfw::getMode() == jfw::JFW_MODE_DIRECT) return JFW_E_DIRECT_MODE; - jfw::NodeJava node; + jfw::NodeJava node(jfw::NodeJava::USER); if (arLocations == NULL && nLen != 0) return JFW_E_INVALID_ARG; node.setJRELocations(arLocations, nLen); diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index 4f1f44a630fd..c03e27fe80b5 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -51,9 +51,6 @@ using ::rtl::OStringToOUString; #define UNO_JAVA_JFW_VENDOR_SETTINGS "UNO_JAVA_JFW_VENDOR_SETTINGS" #define UNO_JAVA_JFW_USER_DATA "UNO_JAVA_JFW_USER_DATA" #define UNO_JAVA_JFW_SHARED_DATA "UNO_JAVA_JFW_SHARED_DATA" -#define UNO_JAVA_JFW_INSTALL_DATA "UNO_JAVA_JFW_INSTALL_DATA" -#define UNO_JAVA_JFW_INSTALL_EXPIRE "UNO_JAVA_JFW_INSTALL_EXPIRE" -#define DEFAULT_INSTALL_EXPIRATION 3600 namespace jfw { @@ -366,12 +363,6 @@ rtl::OUString BootParams::getSharedData() return getParamFirstUrl(UNO_JAVA_JFW_SHARED_DATA); } -rtl::OUString BootParams::getInstallData() -{ - return getParam(UNO_JAVA_JFW_INSTALL_DATA); -} - - rtl::OString BootParams::getClasspath() { rtl::OString sClassPath; @@ -525,34 +516,6 @@ rtl::OUString BootParams::getClasspathUrls() return sParams; } -::sal_uInt32 BootParams::getInstallDataExpiration() -{ - rtl::OUString sValue; - Bootstrap::get()->getFrom( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_INSTALL_EXPIRE)), - sValue); - -#if OSL_DEBUG_LEVEL >=2 - rtl::OString osValue = rtl::OUStringToOString(sValue, osl_getThreadTextEncoding()); - fprintf(stderr,"[Java framework] Using bootstrap parameter " - UNO_JAVA_JFW_INSTALL_EXPIRE " = %s.\n", osValue.getStr()); -#endif - - sal_Int64 nVal = sValue.toInt64(); - if (0 == nVal) - { -#if OSL_DEBUG_LEVEL >=2 - fprintf(stderr,"[Java framework] Using default value for " - "UNO_JAVA_JFW_INSTALL_EXPIRE: %d \n", DEFAULT_INSTALL_EXPIRATION); -#endif - return DEFAULT_INSTALL_EXPIRATION; - } - else - { - return static_cast<sal_uInt32>(nVal); - } -} - JFW_MODE getMode() { static bool g_bMode = false; @@ -673,11 +636,6 @@ rtl::OString getSharedSettingsPath() return getSettingsPath(BootParams::getSharedData()); } -rtl::OString getInstallSettingsPath() -{ - return getSettingsPath(BootParams::getInstallData()); -} - rtl::OString getSettingsPath( const rtl::OUString & sURL) { if (sURL.isEmpty()) diff --git a/jvmfwk/source/fwkbase.hxx b/jvmfwk/source/fwkbase.hxx index 51bd4bb0d5f5..9eb0f0648f47 100644 --- a/jvmfwk/source/fwkbase.hxx +++ b/jvmfwk/source/fwkbase.hxx @@ -70,7 +70,6 @@ namespace BootParams ::rtl::OUString getSharedData(); -::rtl::OUString getInstallData(); /* returns the file URL to the vendor settings xml file. */ ::rtl::OUString getVendorSettings(); @@ -82,12 +81,6 @@ namespace BootParams ::rtl::OUString getClasspathUrls(); -/** returns the content of UNO_JAVA_JFW_INSTALL_EXPIRE or a pretermined - value. If the bootstrap variable contains a string that cannot be - converted by OUString then it returns the predetermined value. -*/ -::sal_uInt32 getInstallDataExpiration(); - } //end namespace @@ -116,8 +109,6 @@ JFW_MODE getMode(); */ ::rtl::OString getUserSettingsPath(); -::rtl::OString getInstallSettingsPath(); - /** Returns the system path of the share settings file. Returns a valid string or throws an exception. @throws FrameworkException diff --git a/jvmfwk/source/javasettingsunopkginstall.xml b/jvmfwk/source/javasettingsunopkginstall.xml deleted file mode 100644 index 3efc8e87fc62..000000000000 --- a/jvmfwk/source/javasettingsunopkginstall.xml +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java xmlns="http://openoffice.org/2004/java/framework/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> -</java> diff --git a/jvmfwk/source/readme.txt b/jvmfwk/source/readme.txt index f4e822513de5..b39576a7e863 100644 --- a/jvmfwk/source/readme.txt +++ b/jvmfwk/source/readme.txt @@ -2,8 +2,3 @@ The file jvfwk3rc is intended for providing bootstrap parameter for the java framework within the build environment. It is not part of a product. Tools which are started in the environment, such as regcomp.exe and uno.exe, use this rc file when Java is needed. - -The file javasettingsunopkginstall.xml only contains the root element of -a settings file (<java ...>). It is a dummy which will be installed into -office/share/config/. Bundled extensions will used this file to store its -java settings. See framework.h bootstrap variable UNO_JAVA_JFW_INSTALL_DATA diff --git a/offapi/com/sun/star/deployment/XExtensionManager.idl b/offapi/com/sun/star/deployment/XExtensionManager.idl index 7744ea6d839e..29acd4e9e0d3 100644 --- a/offapi/com/sun/star/deployment/XExtensionManager.idl +++ b/offapi/com/sun/star/deployment/XExtensionManager.idl @@ -297,26 +297,6 @@ interface XExtensionManager com::sun::star::ucb::CommandAbortedException, com::sun::star::lang::IllegalArgumentException); - - /** synchronizes the special bundled_prereg repository, which is based on - the bundled extensions and has its registration data folder at - $BUNDLED_EXTENSIONS_PREREG (for example openoffice.org3/share/prereg). - - All bundled extensions are registered (<member>XPackage::registerPackage</member>). - The active extensions are NOT determined, because this function only works - with bundled extensions. - - This function is intended to be called during the installation of OOo. - OOo will copy parts of the registration data folder to the user installation at the - first startup. - */ - - void synchronizeBundledPrereg( - [in] com::sun::star::task::XAbortChannel xAbortChannel, - [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv ) - raises (DeploymentException); - - /** returns all extensions which are currently not in use because the user did not accept the license. diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index beb8154a2e20..968a5508688f 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -43,7 +43,6 @@ Module gid_Module_Root_Brand gid_Brand_Dir_Share_C05_Faq, gid_Brand_Dir_Share_Config, gid_Brand_Dir_Share_Extensions, - gid_Brand_Dir_Share_Prereg, gid_Brand_Dir_Share_Uno_Packages, gid_Brand_Dir_Share_Uno_Packages_Cache, gid_Brand_Dir_Share_Registry, @@ -175,12 +174,6 @@ Directory gid_Brand_Dir_Share_Extensions DosName = "extensions"; End -Directory gid_Brand_Dir_Share_Prereg - ParentID = gid_Brand_Dir_Share; - DosName = "prereg"; - Styles = (CREATE); -End - Directory gid_Brand_Dir_Share_Extensions_Dict_Af ParentID = gid_Brand_Dir_Share_Extensions; DosName = "dict-af"; @@ -1165,14 +1158,6 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_User Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}"; End -ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_Prereg - ModuleID = gid_Module_Root_Brand; - ProfileID = gid_Brand_Profile_Fundamental_Ini; - Section = "Bootstrap"; - Key = "BUNDLED_EXTENSIONS_PREREG"; - Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_PREREG}"; -End - ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Packages_Cache ModuleID = gid_Module_Root_Brand; ProfileID = gid_Brand_Profile_Fundamental_Ini; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 6898e7a0a5dd..2d1765bfa32b 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1246,17 +1246,6 @@ File gid_File_Spotlight_Bundle End #endif -File gid_File_Config_Javasettingsunopkginstall - USER_FILE_BODY; - Dir = gid_Brand_Dir_Share_Config; - Name = "javasettingsunopkginstall.xml"; - #ifdef SOLARIS - Styles = (PACKED,VOLATILEFILE); - #else - Styles = (PACKED); - #endif -End - #ifdef THEME_DEFAULT File gid_File_Images_Zip TXT_FILE_BODY; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 66563e5be241..c1980504768f 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -116,8 +116,7 @@ Module gid_Module_Root_Files_2 gid_File_Regcleanold, gid_File_Exe_Regdeinstall, gid_File_Tmp_Inf_Oldreg, - gid_File_Tmp_Userinstall_Inf, - gid_File_Config_Javasettingsunopkginstall); + gid_File_Tmp_Userinstall_Inf); End Module gid_Module_Root_Files_3 diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp index 3fd83da8e391..69ca5c648c60 100644 --- a/scp2/source/ooo/profileitem_ooo.scp +++ b/scp2/source/ooo/profileitem_ooo.scp @@ -121,16 +121,6 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_User Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bundled"; End -ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_Prereg - ProfileID = gid_Profile_Uno_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 1; - Key = "BUNDLED_EXTENSIONS_PREREG"; - Value = "$BRAND_BASE_DIR/share/prereg/bundled"; -End - - ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages ProfileID = gid_Profile_Uno_Ini; ModuleID = gid_Module_Root; diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index 3733fb3e4a51..6d3b11b69d7c 100644 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -176,25 +176,6 @@ WindowsCustomAction gid_Customaction_Shellextensionsdll7 Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "InstallValidate"); End -WindowsCustomAction gid_Customaction_Register_Extensions - Name = "RegisterExtensions"; - Typ = "3585"; - Source = "shlxtmsi.dll"; - Target = "RegisterExtensions"; - Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "InstallFinalize"); - Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "InstallFinalize"); -End - -WindowsCustomAction gid_Customaction_Remove_Extensions - Name = "RemoveExtensions"; - Typ = "3585"; - Source = "shlxtmsi.dll"; - Target = "RemoveExtensions"; - Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "InstallFinalize"); -End - WindowsCustomAction gid_Customaction_Set_Admininstall Name = "SetAdminInstallProperty"; Typ = "65"; diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst index 581bd8541154..f57867952cf9 100644 --- a/setup_native/prj/d.lst +++ b/setup_native/prj/d.lst @@ -14,12 +14,9 @@ mkdir: %_DEST%\bin\userscripts ..\%__SRC%\bin\uninstall %_DEST%\bin\userscripts\uninstall ..\%__SRC%\bin\noarch\fake-db-1.0-0.noarch.rpm %_DEST%\bin\openoffice.org-userland-1.0-0.noarch.rpm -mkdir: %_DEST%\bin\osolsmf ..\%__SRC%\bin\langpackscript.sh %_DEST%\bin\langpackscript.sh ..\%__SRC%\bin\linuxpatchscript.sh %_DEST%\bin\linuxpatchscript.sh ..\%__SRC%\bin\downloadscript.sh %_DEST%\bin\downloadscript.sh -..\%__SRC%\bin\register_extensions %_DEST%\bin\register_extensions -..\%__SRC%\bin\deregister_extensions %_DEST%\bin\deregister_extensions ..\%__SRC%\bin\unpack_update.sh %_DEST%\bin\unpack_update ..\%__SRC%\bin\update.sh %_DEST%\bin\update ..\%__SRC%\bin\javaloader.sh %_DEST%\bin\javaloader.sh @@ -34,10 +31,6 @@ mkdir: %_DEST%\bin\osolsmf ..\source\mac\ooo\DS_Store %_DEST%\bin\osl\DS_Store ..\source\mac\ooo\DS_Store_Dev %_DEST%\bin\osl\DS_Store_Dev ..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin\osl\DS_Store_Langpack -..\source\opensolaris\bundledextensions\installed %_DEST%\bin\osolsmf\installed -..\source\opensolaris\bundledextensions\README %_DEST%\bin\osolsmf\README -..\source\opensolaris\bundledextensions\ooo_bundled_extensions.xml %_DEST%\bin\osolsmf\ooo_bundled_extensions.xml -..\source\opensolaris\bundledextensions\svc-ooo_bundled_extensions %_DEST%\bin\osolsmf\svc-ooo_bundled_extensions ..\source\packinfo\solariscopyrightfile %_DEST%\bin\solariscopyrightfile ..\source\packinfo\linuxcopyrightfile %_DEST%\bin\linuxcopyrightfile ..\source\packinfo\*.txt %_DEST%\bin\*.txt diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl index 5ddeabdb047b..16f3692ff2d9 100644 --- a/setup_native/scripts/admin.pl +++ b/setup_native/scripts/admin.pl @@ -297,69 +297,6 @@ sub get_sourcepath_from_filename_and_includepath return \$onefile; } -############################################################## -# Removing all empty directories below a specified directory -############################################################## - -sub remove_empty_dirs_in_folder -{ - my ( $dir, $firstrun ) = @_; - - if ( $firstrun ) - { - print "Removing superfluous directories\n"; - } - - my @content = (); - - $dir =~ s/\Q$separator\E\s*$//; - - if ( -d $dir ) - { - opendir(DIR, $dir); - @content = readdir(DIR); - closedir(DIR); - - my $oneitem; - - foreach $oneitem (@content) - { - if ((!($oneitem eq ".")) && (!($oneitem eq ".."))) - { - my $item = $dir . $separator . $oneitem; - - if ( -d $item ) # recursive - { - remove_empty_dirs_in_folder($item, 0); - } - } - } - - # try to remove empty directory - my $returnvalue = rmdir $dir; - - # if ( $returnvalue ) { print "Successfully removed empty dir $dir\n"; } - } -} - -#################################################### -# Detecting the directory with extensions -#################################################### - -sub get_extensions_dir -{ - my ( $unopkgfile ) = @_; - - my $localbranddir = $unopkgfile; - get_path_from_fullqualifiedname(\$localbranddir); # "program" dir in brand layer - get_path_from_fullqualifiedname(\$localbranddir); # root dir in brand layer - $localbranddir =~ s/\Q$separator\E\s*$//; - my $extensiondir = $localbranddir . $separator . "share" . $separator . "extensions"; - my $preregdir = $localbranddir . $separator . "share" . $separator . "prereg" . $separator . "bundled"; - - return ($extensiondir, $preregdir); -} - ######################################################## # Finding all files with a specified file extension # in a specified directory. @@ -687,26 +624,6 @@ sub analyze_media_file return \%diskidhash; } -sub analyze_customaction_file -{ - my ($filecontent) = @_; - - my $register_extensions_exists = 0; - - my %table = (); - - for ( my $i = 0; $i <= $#{$filecontent}; $i++ ) - { - if ( ${$filecontent}[$i] =~ /^\s*RegisterExtensions\s+/ ) - { - $register_extensions_exists = 1; - last; - } - } - - return $register_extensions_exists; -} - ################################################################################ # Analyzing the content of Directory.idt ################################################################################# @@ -941,8 +858,6 @@ sub copy_files_into_directory_structure print "Copying files\n"; - my $unopkgfile = ""; - for ( my $i = 1; $i <= $maxsequence; $i++ ) { if ( exists($fileorder->{$i}) ) @@ -984,8 +899,6 @@ sub copy_files_into_directory_structure if ( ! $copyreturn) { exit_program("ERROR: Could not copy $source to $dest\n"); } - # Searching unopkg.exe - if ( $destfile =~ /unopkg\.exe\s*$/ ) { $unopkgfile = $destfile; } # if (( $^O =~ /cygwin/i ) && ( $destfile =~ /\.exe\s*$/ )) { change_privileges($destfile, "775"); } } # else # allowing missing sequence numbers ? @@ -993,8 +906,6 @@ sub copy_files_into_directory_structure # exit_program("ERROR: No file assigned to sequence $i"); # } } - - return ($unopkgfile); } ###################################################### @@ -1085,93 +996,6 @@ sub get_temppath } #################################################################################### -# Registering extensions -#################################################################################### - -sub register_extensions_sync -{ - my ($unopkgfile, $localtemppath, $preregdir) = @_; - - if ( $preregdir eq "" ) - { - my $logtext = "ERROR: Failed to determine \"prereg\" folder for extension registration! Please check your installation set."; - print $logtext . "\n"; - exit_program($logtext); - } - - my $from = cwd(); - - my $path = $unopkgfile; - get_path_from_fullqualifiedname(\$path); - $path =~ s/\\\s*$//; - $path =~ s/\/\s*$//; - - my $executable = $unopkgfile; - make_absolute_filename_to_relative_filename(\$executable); - - chdir($path); - - if ( ! $path_displayed ) - { - print "... current dir: $path ...\n"; - $path_displayed = 1; - } - - $localtemppath =~ s/\\/\//g; - - if ( $^O =~ /cygwin/i ) { - $executable = "./" . $executable; - $preregdir = qx{cygpath -m "$preregdir"}; - chomp($preregdir); - } - - $preregdir =~ s/\/\s*$//g; - - my $systemcall = $executable . " sync --verbose 2\>\&1 |"; - - print "... $systemcall\n"; - - my @unopkgoutput = (); - - open (UNOPKG, $systemcall); - while (<UNOPKG>) {push(@unopkgoutput, $_); } - close (UNOPKG); - - my $returnvalue = $?; # $? contains the return value of the systemcall - - if ($returnvalue) - { - print "ERROR: Could not execute \"$systemcall\"!\nExitcode: '$returnvalue'\n"; - for ( my $j = 0; $j <= $#unopkgoutput; $j++ ) { print "$unopkgoutput[$j]"; } - exit_program("ERROR: $systemcall failed!"); - } - - chdir($from); -} - -#################################################################################### -# Registering all extensions located in /share/extension/install -#################################################################################### - -sub register_extensions -{ - my ($unopkgfile, $temppath, $preregdir) = @_; - - print "Registering extensions:\n"; - - if (( ! -f $unopkgfile ) || ( $unopkgfile eq "" )) - { - print("WARNING: Could not find unopkg.exe (Language Pack?)!\n"); - } - else - { - register_extensions_sync($unopkgfile, $temppath, $preregdir); - remove_complete_directory($temppath, 1); - } - -} - -#################################################################################### # Reading one file #################################################################################### @@ -1412,28 +1236,13 @@ my ( $filehash, $fileorder, $maxsequence ) = analyze_file_file($filecontent); my $fullpathhash = create_directory_structure($dirhash, $targetdir); # Copying files -my ($unopkgfile) = copy_files_into_directory_structure($fileorder, $filehash, $componenthash, $fullpathhash, $maxsequence, $unpackdir, $installdir, $dirhash); +copy_files_into_directory_structure($fileorder, $filehash, $componenthash, $fullpathhash, $maxsequence, $unpackdir, $installdir, $dirhash); if ( $^O =~ /cygwin/i ) { change_privileges_full($targetdir); } my $msidatabase = $targetdir . $separator . $databasefilename; my $copyreturn = copy($databasepath, $msidatabase); if ( ! $copyreturn) { exit_program("ERROR: Could not copy $source to $dest\n"); } -# Reading tables -$filename = $helperdir . $separator . "CustomAction.idt"; -$filecontent = read_file($filename); -my $register_extensions_exists = analyze_customaction_file($filecontent); - -# Removing empty dirs in extension folder -my ( $extensionfolder, $preregdir ) = get_extensions_dir($unopkgfile); -if ( -d $extensionfolder ) { remove_empty_dirs_in_folder($extensionfolder, 1); } - -if ( $register_extensions_exists ) -{ - # Registering extensions - register_extensions($unopkgfile, $temppath, $preregdir); -} - # Saving info in Summary Information Stream of msi database (required for following patches) if ( $msiinfo_available ) { write_sis_info($msidatabase); } diff --git a/setup_native/scripts/deregister_extensions b/setup_native/scripts/deregister_extensions deleted file mode 100644 index 4a8f91de41f0..000000000000 --- a/setup_native/scripts/deregister_extensions +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash - -USAGE="Usage: $0" - -SCRIPTNAME=`basename "$0"` -PROGRAMDIR=`dirname "$0"` -OFFICEDIR="$PROGRAMDIR/.." -EXTENSIONDIR=$OFFICEDIR/share/extension/install -UNOPKG=$PROGRAMDIR/unopkg - -help() -{ - echo - echo "Uninstallation script for office extensions located in <office>/share/extension/install" - echo - echo "This uninstallation script can be executed after successful installation of packages." - echo "Please execute this script, before uninstallation of packages." - echo "Usage: $0" - echo "No parameter required." - echo -} - -# -# This script is only for root installations -# (How about installations done with user privileges?) -# - -# if [ $UID -ne 0 ] -# then -# printf "\nThis script is for installation only wiht administrative rights only\n" -# help -# exit 2 -# fi - -# -# Checking existence of unopkg in program directory -# - -if [ ! -f "$UNOPKG" ]; then - echo "Error: File $UNOPKG does not exist" - exit 1 -fi - -if [ ! -x "$UNOPKG" ]; then - echo "Error: File $UNOPKG is not an executable file" - exit 1 -fi - -# -# Collecting all files located in share/install/extensions -# - -FILELIST=`find $EXTENSIONDIR -type f -name "*.oxt" -print` - -if [ -z "$FILELIST" ] -then - printf "\n$0: No extensions found in $EXTENSIONDIR\n" - exit 2 -fi - -echo -echo "Uninstalling:" -for i in $FILELIST; do - echo `basename $i` -done -echo - -for i in $FILELIST; do - COMMAND="$UNOPKG remove --shared `basename $i`" - echo $COMMAND - $COMMAND -done - -echo -echo "Uninstallation done ..." -echo - -exit 0 diff --git a/setup_native/scripts/install_solaris.sh b/setup_native/scripts/install_solaris.sh index bb792bcf2618..4ded451d9a7f 100644 --- a/setup_native/scripts/install_solaris.sh +++ b/setup_native/scripts/install_solaris.sh @@ -233,10 +233,6 @@ cat > ${INSTALL_ROOT}/usr/lib/postrun << \EOF #!/bin/sh set -e -# Override UserInstallation in bootstraprc for unopkg .. -UserInstallation='$BRAND_BASE_DIR/../UserInstallation' -export UserInstallation - if [ -x /usr/bin/mktemp ] then CMD=`/usr/bin/mktemp /tmp/userinstall.XXXXXX` diff --git a/setup_native/scripts/makefile.mk b/setup_native/scripts/makefile.mk index 7a03660ad858..fd4ec7671f49 100644 --- a/setup_native/scripts/makefile.mk +++ b/setup_native/scripts/makefile.mk @@ -40,8 +40,6 @@ UNIXTEXT= \ $(BIN)$/langpackscript.sh \ $(BIN)$/linuxpatchscript.sh \ $(BIN)$/javaloader.sh \ - $(BIN)$/register_extensions \ - $(BIN)$/deregister_extensions \ $(BIN)$/update.sh \ $(BIN)$/downloadscript.sh diff --git a/setup_native/scripts/register_extensions b/setup_native/scripts/register_extensions deleted file mode 100644 index 034642175c29..000000000000 --- a/setup_native/scripts/register_extensions +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash - -USAGE="Usage: $0" - -SCRIPTNAME=`basename "$0"` -PROGRAMDIR=`dirname "$0"` -OFFICEDIR="$PROGRAMDIR/.." -EXTENSIONDIR=$OFFICEDIR/share/extension/install -REGISTERFILE=$PROGRAMDIR/register.dat -UNOPKG=$PROGRAMDIR/unopkg - -help() -{ - echo - echo "Installation script for office extensions located in <office>/share/extension/install" - echo - echo "This installation script can be executed after successful installation of packages." - echo "Before uninstallation please execute the script \"deregister_extensions\" located next" - echo "to this script." - echo "Usage: $0" - echo "No parameter required." - echo -} - -# -# This script is only for root installations -# (How about installations done with user privileges?) -# - -# if [ $UID -ne 0 ] -# then -# printf "\nThis script is for installation only wiht administrative rights only\n" -# help -# exit 2 -# fi - -# -# Checking existence of unopkg in program directory -# - -if [ ! -f "$UNOPKG" ]; then - echo "Error: File $UNOPKG does not exist" - exit 1 -fi - -if [ ! -x "$UNOPKG" ]; then - echo "Error: File $UNOPKG is not an executable file" - exit 1 -fi - -# -# Collecting all files located in share/install/extensions -# - -FILELIST=`find $EXTENSIONDIR -type f -name "*.oxt" -print` - -if [ -z "$FILELIST" ] -then - printf "\n$0: No extensions found in $EXTENSIONDIR\n" - exit 2 -fi - -echo -echo "Installing:" -for i in $FILELIST; do - echo `basename $i` -done -echo - -for i in $FILELIST; do - COMMAND="$UNOPKG add --shared --suppress-license $i" - echo $COMMAND - $COMMAND -done - -if [ -f $REGISTERFILE ]; then - rm $REGISTERFILE -fi - -echo -echo "Installation done ..." -echo - -exit 0 diff --git a/setup_native/source/opensolaris/bundledextensions/README b/setup_native/source/opensolaris/bundledextensions/README deleted file mode 100644 index f64c225d9df9..000000000000 --- a/setup_native/source/opensolaris/bundledextensions/README +++ /dev/null @@ -1,80 +0,0 @@ -================================================================================ -Installation information -================================================================================ - -In order to properly install the bundled extensions, such as dictionaries, it is -necessary that the files - -installed -ooo_bundled_extensions.xml -svc-ooo_bundled_extensions - -are part of the OpenOffice.org IPS package. They must be added to the package -after all other files have been added. Those other files are the SVR4 packages -of OOo which can be imported by pkg (pkg import). -The files have to be uploaded this way: - -pkgsend -s url_to_pkg_server add file installed mode=644 owner=root group=bin path=${EXTENSIONPATH}/installed restart_fmri=svc:/application/ooo_bundled_extensions:default -pkgsend -s url_to_pkg_server add file svc-ooo_bundled_extensions mode=744 owner=root group=bin path=/lib/svc/method/svc-ooo_bundled_extensions -pkgsend -s url_to_pkg_server add file ooo_bundled_extensions.xml mode=644 owner=root group=bin path=/var/svc/manifest/application/ooo_bundled_extensions.xml restart_fmri=svc:/system/manifest-import:default - - ---- - -${EXTENSIONPATH} must be replaced by the path to the folder containing the -bundled extensions. This path changes with every major release of OOo because of -the version number which is part of a folder name. The -current value is: - -EXTENSIONPATH=/opt/openoffice.org3/share/extension/install - -The service was tested with OpenSolaris release 2009.6 and may not work with a -previous release. - - -================================================================================ -What do these files do -================================================================================ - -The three files constitute a SMF service. When this service is started, then it -installes the bundled extensions which are contained in -/opt/openoffice.org3/share/extension/install. To install them, the service calls -"unopkg add --shared ..." with the appropriate arguments. - -The service is started initially after the installation of -ooo_bundled_extensions.xml. At this time, all files of OOo, including the -extensions, have been copied to their destination. The service calls unopkg on -behalf of every extension and adds the path to that extension to the file -'installed'. The file 'installed' is used to remember what extensions have -already been installed with unopkg. This will prevent to reinstall those -extensions whenever the service is restarted. - -When a new version of OOo becomes available, then the respective OOo package -containes a new version of 'installed'. That is, it contains a version string, -such as 3.2.0. The sole reason for that string is, to change the content of this -file in every release. Otherwise IPS would not replace the installed version of -'installed' with the one contained in the package. - -The update procedure of OOo will replace 'installed'. 'installed' is associated -with a restart_fmri of the service ooo_bundled_extensions. That is after -copying 'installed' the service will be restarted. It then installes all -extensions contained in /opt/openoffice.org3/share/extension/install, because -the newly installed 'installed' file does not contain any entries yet, except -for the version string. - - -================================================================================ -Known issues -================================================================================ - -If OOo, which contains this service, is uninstalled and later it is installed -again, then the bundled extensions are not installed. That is, unopkg is not -called to install them with OOo's Extensions Manager. The reasons is a bug in -OpenSolaris: - -http://defect.opensolaris.org/bz/show_bug.cgi?id=5742 - -To work around this, one can call after uninstalling OOo - -svccfg delete -f ooo_bundled_extensions -svccfg delete smf/manifest diff --git a/setup_native/source/opensolaris/bundledextensions/installed b/setup_native/source/opensolaris/bundledextensions/installed deleted file mode 100644 index f9ccdb6dfe8f..000000000000 --- a/setup_native/source/opensolaris/bundledextensions/installed +++ /dev/null @@ -1 +0,0 @@ -${ABOUTBOXPRODUCTVERSION} diff --git a/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml b/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml deleted file mode 100644 index 66acd508c281..000000000000 --- a/setup_native/source/opensolaris/bundledextensions/ooo_bundled_extensions.xml +++ /dev/null @@ -1,60 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> - -<service_bundle type="manifest" name="ooo_bundled_extensions"> - -<service - name="application/ooo_bundled_extensions" - type="service" - version="1"> - - <create_default_instance enabled="true" /> - <single_instance/> - - <dependency name="service_available" - grouping="require_all" - restart_on="none" - type="service"> - <service_fmri value="svc:/system/filesystem/local:default" /> - </dependency> - - <exec_method - type="method" name="start" - exec="/lib/svc/method/svc-ooo_bundled_extensions start" - timeout_seconds="160"> - <method_context> - <method_credential user="root" group="root" /> - </method_context> - </exec_method> - - - <exec_method - type="method" name="stop" - exec="/lib/svc/method/svc-ooo_bundled_extensions stop" - timeout_seconds="160" > - <method_context> - <method_credential user="root" group="root" /> - </method_context> - </exec_method> - - <property_group name="startd" type="framework"> - <propval name="duration" type="astring" - value="transient" /> - <propval name="ignore_error" - type="astring" value="core,signal" /> - - </property_group> - - <stability value="Unstable" /> - - <template> - <common_name> - <loctext xml:lang="C"> - Installation of OpenOffice.org's bundled extensions. - </loctext> - </common_name> - </template> -</service> - -</service_bundle> diff --git a/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions b/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions deleted file mode 100644 index c4ce0df3b5b8..000000000000 --- a/setup_native/source/opensolaris/bundledextensions/svc-ooo_bundled_extensions +++ /dev/null @@ -1,106 +0,0 @@ -#!/sbin/sh - -. /lib/svc/share/smf_include.sh - -#The start method is used for installing and updating the -#extensions. The service keeps a list -#(share/extensions/install/installed) of the extensions which were -#already installed. During installation, the bundled extensions are -#copied to the install folder (share/extensions/install). Finally this -#service, which is part of the office installation package, will be -#started and the start "method" of this script is called. Then all -#extensions in the "install" folder are checked if they are already -#installed by reading the list "installed". Because the list is empty -#at this time, all the extensions will be installed. -# -#If this service is restarted then the script checks if there is an -#extensions which is not yet installed, that is there is no entry for -#it in the 'installed' file. Only if this is the case then that -#extensions will be installed and its path is added to 'installed'. -# -#In case of an update, new versions of existing extensions and -#completely new extensions may be copied to the 'install' folder. Also -#a new 'installed' file will be copied which replaces the existing -#file. The new 'installed' file does not contain any entries of -#installed extensions. Therefore the next time when the start method is -#run all extensions contained in share/extensions/install will be -#installed. - -#Create the folder which contains the temporary user installation -INSTDIR=`/usr/bin/mktemp -d "/tmp/userinstall.XXXXXX"` - -case "$1" in -'start') - EXTENSIONDIR=/opt/openoffice.org${OOOBRANDPACKAGEVERSION}/share/extension/install - for FILE in $EXTENSIONDIR/*.oxt - do - #We check if the file exist, because if there is no extension - #then $FILE will contain "<..>/*.oxt" - if [ -f "$FILE" ]; then - #Determine if this extension is already installed. We do - #that by checking the file "installed" which contains a - #list of all installed extensions including the full path - EXTENSIONFILE=`basename $FILE` - INSTALLED=`sed -n "/$EXTENSIONFILE/p" $EXTENSIONDIR/installed` - - if [ -z "$INSTALLED" ]; then - #We have not found the name of the extension in the - #list. That is, it has not been installed (with unopkg) yet. - #Therefore we do it now. - echo installing $FILE - /opt/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg add --shared --bundled "$FILE" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=/opt/openoffice.org/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' - #Let us remember that this extensions has been installed - #by adding the path name of the extension to the file - #installed - echo $FILE >> $EXTENSIONDIR/installed - fi - fi - done - - #Now check for extensions which need to be uninstalled - #(unopkg). This is the case if the list of extensions in the file - #installed contains the name of an extension which does not exist - #in the the folder <..>/share/extension/install. -# LINE="" -# NEWCONTENT="" -# REMOVED="" -# LIST=`cat $EXTENSIONDIR/installed` -# #remove blank lines -# LIST=`echo "$LIST" | sed '/^[:blank:]*$/d'` - -# echo "$LIST" | while [ 1 ] -# do -# read LINE || break -# if [ ! -f "$LINE" ]; then -# #The extension file has been removed from -# #share/extension/install. Now we remove the installed -# #extension -# echo removing `basename $LINE` -# /opt/openoffice.org${OOOBRANDPACKAGEVERSION}/program/unopkg remove --shared --bundled "`basename $LINE`" '-env:UserInstallation=file://$INSTDIR' '-env:UNO_JAVA_JFW_INSTALL_DATA=/opt/openoffice.org/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' -# REMOVED=1 -# else -# NEWCONTENT+=$LINE -# NEWCONTENT+="\n" -# fi -# done - -# #Write the new list to the file "installed". It now has all names -# #remove which refered to previously removed extensions (removed -# #from .../share/extension/install) -# if [ "$REMOVED" ]; then -# #remove the last empty line -# NEWCONTENT=`echo "$NEWCONTENT" | sed '/^[:space:]*$/d'` -# echo "$NEWCONTENT" > $EXTENSIONDIR/installed -# fi - - ;; - 'stop') - echo "#### stop ####" - ;; - *) - echo "Usage: $0 { start | stop }" - exit 1 - ;; -esac - -exit $SMF_EXIT_OK diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index 0e4a704d9e3a..bc7605bfd1ce 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -462,7 +462,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Af" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-af" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-af" @@ -478,7 +477,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_An" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-an" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-an" @@ -494,7 +492,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Ar" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ar" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ar" @@ -510,7 +507,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Be" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-be" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-be" @@ -526,7 +522,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Bg" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-bg" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-bg" @@ -542,7 +537,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Bn" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-bn" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-bn" @@ -558,7 +552,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Br" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-br" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-br" @@ -574,7 +567,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Ca" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ca" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ca" @@ -590,7 +582,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Cs" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-cs" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-cs" @@ -606,7 +597,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Da" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-da" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-da" @@ -622,7 +612,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_De" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-de" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-de" @@ -638,7 +627,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_En" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-en" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-en" @@ -654,7 +642,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_El" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-el" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-el" @@ -670,7 +657,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Es" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-es" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-es" @@ -686,7 +672,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Et" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-et" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-et" @@ -702,7 +687,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Fr" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-fr" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-fr" @@ -718,7 +702,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Gd" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-gd" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-dict-gd" @@ -734,7 +717,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Gl" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-gl" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-dict-gl" @@ -750,7 +732,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Gu" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-gu" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-dict-gu" @@ -766,7 +747,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_He" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-he" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-he" @@ -782,7 +762,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Hi" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-hi" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-hi" @@ -798,7 +777,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Hu" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-hu" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-hu" @@ -814,7 +792,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Hr" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-hr" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-hr" @@ -830,7 +807,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_It" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-it" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-it" @@ -846,7 +822,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Ku_Tr" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ku-TR" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION" packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ku-TR" @@ -862,7 +837,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Lt" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-lt" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-lt" @@ -878,7 +852,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Lv" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-lv" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-lv" @@ -894,7 +867,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Ne" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ne" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ne" @@ -910,7 +882,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Nl" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-nl" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-nl" @@ -926,7 +897,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_No" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-no" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-no" @@ -942,7 +912,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Oc" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-oc" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-oc" @@ -958,7 +927,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Pl" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-pl" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-pl" @@ -974,7 +942,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Pt" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-pt" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-pt" @@ -990,7 +957,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Pt_Pt" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-pt-pt" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-pt-pt" @@ -1006,7 +972,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Ro" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ro" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ro" @@ -1022,7 +987,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Ru" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ru" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ru" @@ -1038,7 +1002,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Si" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-si" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-si" @@ -1054,7 +1017,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Sk" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sk" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sk" @@ -1070,7 +1032,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Sl" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sl" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sl" @@ -1086,7 +1047,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Sr" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sr" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sr" @@ -1102,7 +1062,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Sv" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sv" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sv" @@ -1118,7 +1077,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Sw" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sw" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sw" @@ -1134,7 +1092,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Te" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-te" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-te" @@ -1150,7 +1107,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Th" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-th" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-th" @@ -1166,7 +1122,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Uk" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-uk" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-uk" @@ -1182,7 +1137,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Vi" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-vi" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-dict-vi" @@ -1198,7 +1152,6 @@ End Start module = "gid_Module_Root_Extension_Dictionary_Zu" -script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-zu" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-zu" diff --git a/setup_native/source/packinfo/packinfo_office_lang.txt b/setup_native/source/packinfo/packinfo_office_lang.txt index c33d84c1414e..c49ad0b56635 100644 --- a/setup_native/source/packinfo/packinfo_office_lang.txt +++ b/setup_native/source/packinfo/packinfo_office_lang.txt @@ -178,7 +178,6 @@ End Start module = "gid_Module_Optional_Extensions_Sun_T_Pack" -script = "shellscripts_extensions.txt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-sun-templates-pack-%LANGUAGESTRING" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-sun-templates-pack-%LANGUAGESTRING" diff --git a/setup_native/source/packinfo/shellscripts_extensions.txt b/setup_native/source/packinfo/shellscripts_extensions.txt deleted file mode 100644 index 3ab47f925802..000000000000 --- a/setup_native/source/packinfo/shellscripts_extensions.txt +++ /dev/null @@ -1,144 +0,0 @@ -%system solaris - -%postinstall << END - -# -# Need to check diskless service install and make sure use the correct unpkg -# -DISKLESS_SRVC=`echo $$BASEDIR | /usr/bin/grep export/Solaris_[1-9][0-9]/usr_$${ARCH}.all` -if [ "$$DISKLESS_SRVC" ]; then - UNOPKG=/export/Solaris_11/usr_`uname -p`.allPRODUCTDIRECTORYNAME/program/unopkg - POSTRUN=$$PKG_INSTALL_ROOT/usr_`uname -p`.all/usr/lib/postrun - CLIENT_BASEDIR=$$PKG_INSTALL_ROOT/usr_$${ARCH}.all -else - UNOPKG=$$BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg - POSTRUN=$$PKG_INSTALL_ROOT/usr/lib/postrun -fi -# Use postrun command on Solaris where available (OpenSolaris) -if [ -x $$POSTRUN ]; then -( echo "test -x \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" || exit 0" - echo "umask 022" - echo "\"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" sync" - echo "find \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled\" -type f -exec chmod 644 {} \\;" -) | $$POSTRUN -b -c UNOPKG - if [ "$$?" != "0" ]; then - echo "\nERROR: Installation of UNO extensions" - echo " through $$POSTRUN failed." - exit 1 - fi -else - # No postrun available, try running unopkg directly - "$$UNOPKG" sync - find "$$BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \; - if [ "$$?" != "0" ]; then - echo "\nERROR: Installation of UNO extensions failed." - test "$$BASEDIR" = "$$CLIENT_BASEDIR" || echo "ERROR: alternate root install requires SUNWpostrun package to be installed" - echo 'ERROR: Make sure the runtime requirements (operating system, patch level, architecture) are met.' - exit 1 - fi -fi - -exit 0 -END - -%postremove << END - -# Use postrun command on Solaris where available (OpenSolaris) -if [ -x $$PKG_INSTALL_ROOT/usr/lib/postrun ]; then -( echo "test -x \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" || exit 0" - echo "cd \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program\"" - echo "umask 022" - echo "\"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" sync" - echo "find \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled\" -type f -exec chmod 644 {} \\;" -) | $$PKG_INSTALL_ROOT/usr/lib/postrun -c UNOPKG -else - # No postrun available, try running unopkg directly - test -x $$BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg || exit 0 - "$$BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg" sync - echo "find \"$$BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled\" -type f -exec chmod 644 {} \\;" - if [ "$$?" != "0" ]; then - echo "\nERROR: Removal of UNO extension failed." - test "$$BASEDIR" = "$$CLIENT_BASEDIR" || echo "ERROR: alternate root uninstall requires SUNWpostrun package to be installed" - echo 'ERROR: Make sure the runtime requirements (operating system, patch level, architecture) are met.' - exit 1 - fi -fi - - -exit 0 -END - -%system linux - -%format rpm - -%postinstall << END - -if [ -x "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" ]; then - "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" sync - if [ "$$?" != "0" ]; then - echo "ERROR: Registration of extensions failed!" - exit 1 - else - echo "SUCCESS: unopkg returns successful!" - fi - find "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \; -fi - -exit 0 - -END - -%postremove << END - -if [ -x "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" ]; then - "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" sync - if [ "$$?" != "0" ]; then - echo "ERROR: Registration of extensions failed!" - exit 1 - else - echo "SUCCESS: unopkg returns successful!" - fi - find "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \; -fi - -exit 0 -END - -%format deb - -%postinstall << END - -if [ -x "PRODUCTDIRECTORYNAME/program/unopkg" ]; then - "PRODUCTDIRECTORYNAME/program/unopkg" sync - if [ "$$?" != "0" ]; then - echo "ERROR: Registration of extensions failed!" - exit 1 - else - echo "SUCCESS: unopkg returns successful!" - fi - find "PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \; -fi - -exit 0 - -END - -%postremove << END - -if [ -x "PRODUCTDIRECTORYNAME/program/unopkg" ] -then - "PRODUCTDIRECTORYNAME/program/unopkg" sync - if [ "$$?" != "0" ]; then - echo "ERROR: Registration of extensions failed!" - exit 1 - else - echo "SUCCESS: unopkg returns successful!" - fi - find "PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \; -fi - -exit 0 -END - -%system all diff --git a/setup_native/source/win32/customactions/languagepacks/exports.dxp b/setup_native/source/win32/customactions/languagepacks/exports.dxp index eb3e3c34829a..8309a1be9bdc 100644 --- a/setup_native/source/win32/customactions/languagepacks/exports.dxp +++ b/setup_native/source/win32/customactions/languagepacks/exports.dxp @@ -1,5 +1,4 @@ SetProductInstallationPath RegisterLanguagePack GetUserInstallMode -RegisterExtensions diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk index 921ca9baa9c7..dfd9a374a66c 100644 --- a/setup_native/source/win32/customactions/languagepacks/makefile.mk +++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk @@ -64,7 +64,6 @@ STDSHL+= \ SHL1OBJS = $(SLOFILES) \ - $(SLO)$/registerextensions.obj \ $(SLO)$/seterror.obj SHL1TARGET = $(TARGET) diff --git a/setup_native/source/win32/customactions/patch/exports.dxp b/setup_native/source/win32/customactions/patch/exports.dxp index 360156e6c25b..bb660772a68b 100644 --- a/setup_native/source/win32/customactions/patch/exports.dxp +++ b/setup_native/source/win32/customactions/patch/exports.dxp @@ -6,5 +6,3 @@ ShutDownQuickstarter SetFeatureState SetNewFeatureState ShowOnlineUpdateDialog -RegisterExtensions -RemoveExtensions diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk index 6b05b3df89b9..f1c9b2440b24 100644 --- a/setup_native/source/win32/customactions/patch/makefile.mk +++ b/setup_native/source/win32/customactions/patch/makefile.mk @@ -64,7 +64,6 @@ SHL1OBJS = $(SLOFILES) \ $(SLO)$/shutdown_quickstart.obj \ $(SLO)$/quickstarter.obj \ $(SLO)$/upgrade.obj \ - $(SLO)$/registerextensions.obj \ $(SLO)$/seterror.obj SHL1TARGET = $(TARGET) diff --git a/setup_native/source/win32/customactions/shellextensions/exports.dxp b/setup_native/source/win32/customactions/shellextensions/exports.dxp index 474df7651882..aa86c2e0be57 100644 --- a/setup_native/source/win32/customactions/shellextensions/exports.dxp +++ b/setup_native/source/win32/customactions/shellextensions/exports.dxp @@ -5,8 +5,6 @@ RebuildShellIconCache ExecutePostUninstallScript CompleteInstallPath MigrateInstallPath -RegisterExtensions -RemoveExtensions CheckInstallDirectory SetAdminInstallProperty CreateLayerLinks diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk index c7e619e517e3..ac50c2e141a2 100644 --- a/setup_native/source/win32/customactions/shellextensions/makefile.mk +++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk @@ -55,7 +55,6 @@ SLOFILES = \ $(SLO)$/setadmininstall.obj \ $(SLO)$/layerlinks.obj \ $(SLO)$/dotnetcheck.obj \ - $(SLO)$/registerextensions.obj \ $(SLO)$/copyeditiondata.obj \ $(SLO)$/vistaspecial.obj \ $(SLO)$/checkpatches.obj \ diff --git a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx deleted file mode 100644 index b1c1810e43e5..000000000000 --- a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx +++ /dev/null @@ -1,227 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#undef UNICODE -#undef _UNICODE - -#define _WIN32_WINDOWS 0x0410 - -#ifdef _MSC_VER -#pragma warning(push, 1) /* disable warnings within system headers */ -#define WIN32_LEAN_AND_MEAN -#endif -#include <windows.h> -#include <msiquery.h> -#include <shellapi.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif - -#include <malloc.h> -#include <assert.h> -#include <string.h> - -#ifdef UNICODE -#define _UNICODE -#define _tstring wstring -#else -#define _tstring string -#endif -#include <tchar.h> -#include <string> - -static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty ) -{ - std::_tstring result; - TCHAR szDummy[1] = TEXT(""); - DWORD nChars = 0; - - if ( MsiGetProperty( handle, sProperty.c_str(), szDummy, &nChars ) == ERROR_MORE_DATA ) - { - DWORD nBytes = ++nChars * sizeof(TCHAR); - LPTSTR buffer = reinterpret_cast<LPTSTR>(_alloca(nBytes)); - ZeroMemory( buffer, nBytes ); - MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars); - result = buffer; - } - - return result; -} - -/* creates a child process which is specified in lpCommand. - - out_exitCode is the exit code of the child process -**/ -static BOOL ExecuteCommand( LPCTSTR lpCommand, DWORD * out_exitCode) -{ - BOOL fSuccess = FALSE; - STARTUPINFO si; - PROCESS_INFORMATION pi; - - ZeroMemory( &si, sizeof(si) ); - si.cb = sizeof(si); - - fSuccess = CreateProcess( - NULL, - (LPTSTR)lpCommand, - NULL, - NULL, - FALSE, - 0, - NULL, - NULL, - &si, - &pi - ); - - if ( fSuccess ) - { - WaitForSingleObject( pi.hProcess, INFINITE ); - - if (!GetExitCodeProcess( pi.hProcess, out_exitCode)) - fSuccess = FALSE; - - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - } - - return fSuccess; -} - -static BOOL RemoveCompleteDirectory( std::_tstring sPath ) -{ - bool bDirectoryRemoved = true; - - std::_tstring sPattern = sPath + TEXT("\\") + TEXT("*.*"); - WIN32_FIND_DATA aFindData; - - // Finding all content in sPath - - HANDLE hFindContent = FindFirstFile( sPattern.c_str(), &aFindData ); - - if ( hFindContent != INVALID_HANDLE_VALUE ) - { - bool fNextFile = false; - - do - { - std::_tstring sFileName = aFindData.cFileName; - std::_tstring sCurrentDir = TEXT("."); - std::_tstring sParentDir = TEXT(".."); - - if (( strcmp(sFileName.c_str(),sCurrentDir.c_str()) != 0 ) && - ( strcmp(sFileName.c_str(),sParentDir.c_str()) != 0 )) - { - std::_tstring sCompleteFileName = sPath + TEXT("\\") + sFileName; - - if ( aFindData.dwFileAttributes == FILE_ATTRIBUTE_DIRECTORY ) - { - RemoveCompleteDirectory(sCompleteFileName); - } - else - { - DeleteFile( sCompleteFileName.c_str() ); - } - } - - fNextFile = FindNextFile( hFindContent, &aFindData ); - - } while ( fNextFile ); - - FindClose( hFindContent ); - - // empty directory can be removed now - // RemoveDirectory is only successful, if the last handle to the directory is closed - // -> first removing content -> closing handle -> remove empty directory - - if ( ! ( RemoveDirectory(sPath.c_str()) ) ) - { - bDirectoryRemoved = false; - } - } - - return bDirectoryRemoved; -} - -extern "C" UINT __stdcall RegisterExtensions(MSIHANDLE handle) -{ - std::_tstring sInstDir = GetMsiProperty( handle, TEXT("CustomActionData") ); - std::_tstring sUnoPkgFile = sInstDir + TEXT("program\\unopkg.exe"); - std::_tstring mystr; - - WIN32_FIND_DATA aFindFileData; - bool registrationError = false; - - // Find unopkg.exe - HANDLE hFindUnopkg = FindFirstFile( sUnoPkgFile.c_str(), &aFindFileData ); - - if ( hFindUnopkg != INVALID_HANDLE_VALUE ) - { - // unopkg.exe exists in program directory - std::_tstring sCommand = sUnoPkgFile + " sync"; - - DWORD exitCode = 0; - bool fSuccess = ExecuteCommand( sCommand.c_str(), & exitCode); - if ( ! fSuccess ) - { - mystr = "ERROR: An error occured during registration of extensions!"; - MessageBox(NULL, mystr.c_str(), "ERROR", MB_OK); - registrationError = true; - } - - FindClose( hFindUnopkg ); - } - - if ( registrationError ) - { - return 1; - } - else - { - return ERROR_SUCCESS; - } -} - - -extern "C" UINT __stdcall RemoveExtensions(MSIHANDLE handle) -{ - std::_tstring sInstDir = GetMsiProperty( handle, TEXT("CustomActionData") ); - - // Removing complete directory "share\prereg\bundled" - RemoveCompleteDirectory( sInstDir + TEXT("share\\prereg\\bundled") ); - - // At this point we need to take care about removing upper directories, - // because we are after InstallFinalize. We remove only empty directories. - RemoveDirectory( (sInstDir + TEXT("share\\prereg")).c_str() ); - RemoveDirectory( (sInstDir + TEXT("share")).c_str() ); - RemoveDirectory( sInstDir.c_str() ); - - return ERROR_SUCCESS; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/setup_native/tests/opensolaris/bundledextensions/send_ooo b/setup_native/tests/opensolaris/bundledextensions/send_ooo deleted file mode 100644 index 669e63ceda1b..000000000000 --- a/setup_native/tests/opensolaris/bundledextensions/send_ooo +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/bash - - -if [ $# = 0 ] -then -echo "usage: send_ooo path_to_pkg_folder - -The files -installed, -ooo_bundled_extension.xml, -svc-ooo_bundled_extension -must be in the current directory. The pkg.depotd or the service -application/pkg/server must listen to port 80" - -exit -fi - - -EXTENSIONPATH=/opt/openoffice.org3/share/extension/install - -eval `pkgsend -s http://localhost:80 open ooo_test@3.2-1` -pkgsend -s http://localhost:80 import $1/openofficeorg-ure -pkgsend -s http://localhost:80 import $1/ooobasis* -pkgsend -s http://localhost:80 import $1/openofficeorg3* - -pkgsend -s http://localhost:80 add file installed mode=644 owner=root group=bin path=${EXTENSIONPATH}/installed restart_fmri=svc:/application/ooo_bundled_extensions:default -pkgsend -s http://localhost:80 add file svc-ooo_bundled_extensions mode=744 owner=root group=bin path=/lib/svc/method/svc-ooo_bundled_extensions -pkgsend -s http://localhost:80 add file ooo_bundled_extensions.xml mode=644 owner=root group=bin path=/var/svc/manifest/application/ooo_bundled_extensions.xml restart_fmri=svc:/system/manifest-import:default - -pkgsend -s http://localhost:80 add set name=description value="OOo 3.2 with dictionaries: en fr es da de" -pkgsend -s http://localhost:80 close - diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 388f9cc82d84..3b19d9cd9581 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -1437,46 +1437,6 @@ sub make_prototypefile_relocatable } } - -######################################################################### -# In scp the flag VOLATEFILE can be used. This shall lead to style "v" -# in Solaris prototype file. This is not supported by epm and has -# therefore to be included in prototypefile, not in epm list file. -######################################################################### - -sub set_volatilefile_into_prototypefile -{ - my ($prototypefile, $filesref) = @_; - - for ( my $i = 0; $i <= $#{$filesref}; $i++ ) - { - my $onefile = ${$filesref}[$i]; - - my $styles = ""; - if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; } - - if ( $styles =~ /\bVOLATILEFILE\b/ ) - { - my $sourcepath = $onefile->{'sourcepath'}; - - for ( my $j = 0; $j <= $#{$prototypefile}; $j++ ) - { - if (( ${$prototypefile}[$j] =~ /^\s*f\s+none\s+/ ) && ( ${$prototypefile}[$j] =~ /\=\Q$sourcepath\E\s+/ )) - { - my $oldline = ${$prototypefile}[$j]; - ${$prototypefile}[$j] =~ s/^\s*f/v/; - my $newline = ${$prototypefile}[$j]; - $oldline =~ s/\s*$//; - $newline =~ s/\s*$//; - my $infoline = "Volatile file: Changing content from \"$oldline\" to \"$newline\" .\n"; - push(@installer::globals::logfileinfo, $infoline); - last; - } - } - } - } -} - ######################################################################### # Replacing the variables in the Solaris patch shell scripts. # Taking care, that multiple slashes are not always removed. @@ -2066,7 +2026,6 @@ sub prepare_packages my $prototypefile = installer::files::read_file($prototypefilename); make_prototypefile_relocatable($prototypefile, $relocatablepath); - set_volatilefile_into_prototypefile($prototypefile, $filesref); my $classesstring = set_tab_into_datafile($prototypefile, $filesref); if ($classesstring) { diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 09b3b2d14f3a..7b5876f33eb8 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -456,7 +456,6 @@ BEGIN { $zippath = "zip"; # Has to be in the path: /usr/bin/zip $checksumfile = "so_checksum"; - $unopkgfile = "unopkg.exe"; $separator = "/"; $pathseparator = "\:"; $libextension = "\.dll"; @@ -472,7 +471,6 @@ BEGIN { $zippath = "zip"; # Has to be in the path: /usr/bin/zip $checksumfile = "so_checksum"; - $unopkgfile = "unopkg"; $separator = "/"; $pathseparator = "\:"; if ( $plat =~ /darwin/i ) diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 5f477a5c8924..d15ad28a2912 100755 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -60,119 +60,6 @@ sub check_simple_packager_project } } -#################################################### -# Detecting the directory with extensions -#################################################### - -sub get_extensions_dir -{ - my ( $subfolderdir ) = @_; - - my $extensiondir = $subfolderdir . $installer::globals::separator; - if ( $installer::globals::officedirhostname ne "" ) { $extensiondir = $extensiondir . $installer::globals::officedirhostname . $installer::globals::separator; } - my $extensionsdir = $extensiondir . "share" . $installer::globals::separator . "extensions"; - my $preregdir = $extensiondir . "share" . $installer::globals::separator . "prereg" . $installer::globals::separator . "bundled"; - - return ( $extensionsdir, $preregdir ); -} - -#################################################### -# Registering extensions -#################################################### - -sub register_extensions -{ - my ($officedir, $languagestringref, $preregdir) = @_; - - my $infoline = ""; - - if ( $preregdir eq "" ) - { - $infoline = "ERROR: Failed to determine directory \"prereg\" for extension registration! Please check your installation set.\n"; - push( @installer::globals::logfileinfo, $infoline); - installer::exiter::exit_program($infoline, "register_extensions"); - } - - my $programdir = $officedir . $installer::globals::separator; - if ( $installer::globals::officedirhostname ne "" ) { $programdir = $programdir . $installer::globals::officedirhostname . $installer::globals::separator; } - $programdir = $programdir . "program"; - - my $from = cwd(); - chdir($programdir); - - my $unopkgfile = $installer::globals::unopkgfile; - - my $unopkgexists = 1; - if (( $installer::globals::languagepack ) && ( ! -f $unopkgfile )) - { - $unopkgexists = 0; - $infoline = "Language packs do not contain unopkg!\n"; - push( @installer::globals::logfileinfo, $infoline); - } - - if (( $installer::globals::helppack ) && ( ! -f $unopkgfile )) - { - $unopkgexists = 0; - $infoline = "Help packs do not contain unopkg!\n"; - push( @installer::globals::logfileinfo, $infoline); - } - - if ( ! -f $unopkgfile ) - { - $unopkgexists = 0; - $infoline = "Info: File $unopkgfile does not exist! Extensions cannot be registered.\n"; - push( @installer::globals::logfileinfo, $infoline); - } - - if ( $unopkgexists ) - { - my $currentdir = cwd(); - print "... current dir: $currentdir ...\n"; - $infoline = "Current dir: $currentdir\n"; - push( @installer::globals::logfileinfo, $infoline); - - if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); } - - my $systemcall = "JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 " . $unopkgfile . " sync --verbose" . " -env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 |"; - - print "... $systemcall ...\n"; - - $infoline = "Systemcall: $systemcall\n"; - push( @installer::globals::logfileinfo, $infoline); - - my @unopkgoutput = (); - - open (UNOPKG, $systemcall); - while (<UNOPKG>) - { - my $lastline = $_; - push(@unopkgoutput, $lastline); - } - close (UNOPKG); - - my $returnvalue = $?; # $? contains the return value of the systemcall - - if ($returnvalue) - { - # Writing content of @unopkgoutput only in the error case into the log file. Sometimes it - # contains strings like "Error" even in the case of success. This causes a packaging error - # when the log file is analyzed at the end, even if there is no real error. - for ( my $j = 0; $j <= $#unopkgoutput; $j++ ) { push( @installer::globals::logfileinfo, "$unopkgoutput[$j]"); } - - $infoline = "ERROR: Could not execute \"$systemcall\"!\nExitcode: '$returnvalue'\n"; - push( @installer::globals::logfileinfo, $infoline); - installer::exiter::exit_program("ERROR: $systemcall failed!", "register_extensions"); - } - else - { - $infoline = "Success: Executed \"$systemcall\" successfully!\n"; - push( @installer::globals::logfileinfo, $infoline); - } - } - - chdir($from); -} - ######################################################################## # Getting the translation file for the Mac Language Pack installer ######################################################################## @@ -784,15 +671,6 @@ sub create_simple_package installer::logger::print_message( "... removing superfluous directories ...\n" ); installer::logger::include_header_into_logfile("Removing superfluous directories:"); - my ( $extensionfolder, $preregdir ) = get_extensions_dir($subfolderdir); - installer::systemactions::remove_empty_dirs_in_folder($extensionfolder); - - # Registering the extensions - - installer::logger::print_message( "... registering extensions ...\n" ); - installer::logger::include_header_into_logfile("Registering extensions:"); - register_extensions($subfolderdir, $languagestringref, $preregdir); - if ( $installer::globals::compiler =~ /^unxmacx/ ) { installer::worker::put_scpactions_into_installset("$installdir/$packagename"); diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm index 1ad4e4104eb4..713c520d0de2 100644 --- a/solenv/bin/modules/installer/systemactions.pm +++ b/solenv/bin/modules/installer/systemactions.pm @@ -1578,51 +1578,4 @@ sub read_full_directory { return } -############################################################## -# Removing all empty directories below a specified directory -############################################################## - -sub remove_empty_dirs_in_folder -{ - my ( $dir ) = @_; - - my @content = (); - my $infoline = ""; - - $dir =~ s/\Q$installer::globals::separator\E\s*$//; - - if ( -d $dir ) - { - opendir(DIR, $dir); - @content = readdir(DIR); - closedir(DIR); - - my $oneitem; - - foreach $oneitem (@content) - { - if ((!($oneitem eq ".")) && (!($oneitem eq ".."))) - { - my $item = $dir . $installer::globals::separator . $oneitem; - - if ( -d $item ) # recursive - { - remove_empty_dirs_in_folder($item); - } - } - } - - # try to remove empty directory - my $returnvalue = rmdir $dir; - - if ( $returnvalue ) - { - $infoline = "Successfully removed empty dir $dir\n"; - push(@installer::globals::logfileinfo, $infoline); - } - - } - -} - 1; diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm index e088cafd88a4..e6e69b8f5509 100644 --- a/solenv/bin/modules/installer/windows/admin.pm +++ b/solenv/bin/modules/installer/windows/admin.pm @@ -440,8 +440,6 @@ sub copy_files_into_directory_structure { my ($fileorder, $filehash, $componenthash, $fullpathhash, $maxsequence, $unpackdir, $installdir, $dirhash) = @_; - my $unopkgfile = ""; - for ( my $i = 1; $i <= $maxsequence; $i++ ) { if ( exists($fileorder->{$i}) ) @@ -491,12 +489,8 @@ sub copy_files_into_directory_structure push(@installer::globals::logfileinfo, $infoline); installer::exiter::exit_program($infoline, "copy_files_into_directory_structure"); } - - if ( $destfile =~ /unopkg\.exe\s*$/ ) { $unopkgfile = $destfile; } } } - - return $unopkgfile; } @@ -750,66 +744,6 @@ sub write_sis_info } } -#################################################### -# Detecting the directory with extensions -#################################################### - -sub get_extensions_dir -{ - my ( $unopkgfile ) = @_; - - my $localbranddir = $unopkgfile; - installer::pathanalyzer::get_path_from_fullqualifiedname(\$localbranddir); # "program" dir in brand layer - installer::pathanalyzer::get_path_from_fullqualifiedname(\$localbranddir); # root dir in brand layer - $localbranddir =~ s/\Q$installer::globals::separator\E\s*$//; - my $extensiondir = $localbranddir . $installer::globals::separator . "share" . $installer::globals::separator . "extensions"; - - return $extensiondir; -} - -############################################################## -# Removing all empty directories below a specified directory -############################################################## - -sub remove_empty_dirs_in_folder -{ - my ( $dir, $firstrun ) = @_; - - if ( $firstrun ) - { - print "Removing superfluous directories\n"; - } - - my @content = (); - - $dir =~ s/\Q$installer::globals::separator\E\s*$//; - - if ( -d $dir ) - { - opendir(DIR, $dir); - @content = readdir(DIR); - closedir(DIR); - - my $oneitem; - - foreach $oneitem (@content) - { - if ((!($oneitem eq ".")) && (!($oneitem eq ".."))) - { - my $item = $dir . $installer::globals::separator . $oneitem; - - if ( -d $item ) # recursive - { - remove_empty_dirs_in_folder($item, 0); - } - } - } - - # try to remove empty directory - my $returnvalue = rmdir $dir; - } -} - #################################################################################### # Simulating an administrative installation #################################################################################### @@ -881,18 +815,11 @@ sub make_admin_install my $fullpathhash = create_directory_structure($dirhash, $targetdir); # Copying files - my $unopkgfile = copy_files_into_directory_structure($fileorder, $filehash, $componenthash, $fullpathhash, $maxsequence, $unpackdir, $installdir, $dirhash); + copy_files_into_directory_structure($fileorder, $filehash, $componenthash, $fullpathhash, $maxsequence, $unpackdir, $installdir, $dirhash); my $msidatabase = $targetdir . $installer::globals::separator . $databasefilename; installer::systemactions::copy_one_file($databasepath, $msidatabase); - if ( $unopkgfile ne "" ) - { - # Removing empty dirs in extension folder - my $extensionfolder = get_extensions_dir($unopkgfile); - if ( -d $extensionfolder ) { remove_empty_dirs_in_folder($extensionfolder, 1); } - } - # Editing registry table because of wrong Property value # my $registryfilename = $helperdir . $installer::globals::separator . "Registry.idt"; # my $componentfilename = $helperdir . $installer::globals::separator . "Component.idt"; diff --git a/test/Package_unittest.mk b/test/Package_unittest.mk index b861c933e951..fec4dbf28911 100644 --- a/test/Package_unittest.mk +++ b/test/Package_unittest.mk @@ -40,7 +40,6 @@ $(eval $(call gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/tem $(eval $(call gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/standard.bau,user/autotext/en-US/standard.bau)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/crdbus50.bau,user/autotext/en-US/crdbus50.bau)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/psetup.xpm,user/config/psetup.xpm)) -$(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/javasettingsunopkginstall.xml,user/config/javasettingsunopkginstall.xml)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/simpress/transitions.xml,user/config/soffice.cfg/simpress/transitions.xml)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/simpress/transitions-ogl.xml,user/config/soffice.cfg/simpress/transitions-ogl.xml)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/simpress/effects.xml,user/config/soffice.cfg/simpress/effects.xml)) |