DEV300: changesets OOO330 up to m5

javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java

@@ -75,6 +75,8 @@ public class InstallData
     static private boolean databaseQueried = false;
     static private boolean useRtl = false;
     static private boolean installedProductMinorSet = false;
+    static private boolean isDebianSystem = false;
+    static private boolean debianInvestigated = false;
     static private String installType;            /* custom or typical installation */
     static private String osType;                 /* Linux, SunOS, ...              */
     static private String installDir = null;
@@ -649,6 +651,22 @@ public class InstallData
         installedProductMinorSet = value;
     }
 
+    public boolean debianInvestigated() {
+        return debianInvestigated;
+    }
+
+    public void setDebianInvestigated(boolean value) {
+        debianInvestigated = value;
+    }
+
+    public boolean isDebianSystem() {
+        return isDebianSystem;
+    }
+
+    public void setIsDebianSystem(boolean value) {
+        isDebianSystem = value;
+    }
+
     public boolean databaseQueried() {
         return databaseQueried;
     }

javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java

@@ -381,6 +381,27 @@ import java.util.Vector;public class LinuxHelper {
         return databasePath;
     }
 
+    public void investigateDebian(InstallData data) {
+
+        // String rpmQuery = "rpm --help;
+        String[] rpmQueryArray = new String[2];
+        rpmQueryArray[0] = "rpm";
+        rpmQueryArray[1] = "--help";
+
+        Vector returnVector = new Vector();
+        Vector returnErrorVector = new Vector();
+        int returnValue = ExecuteProcess.executeProcessReturnVector(rpmQueryArray, returnVector, returnErrorVector);
+
+        // Checking if the return vector contains the string "force-debian"
+
+        for (int i = 0; i < returnVector.size(); i++) {
+            String line = (String) returnVector.get(i);
+            if ( line.indexOf("force-debian") > -1 ) {
+                data.setIsDebianSystem(true);
+            }
+        }
+    }
+
     public void getLinuxFileInfo(PackageDescription packageData) {
         // analyzing a string like "openoffice-core01-2.0.3-159" as "name-version-release"
         InstallData data = InstallData.getInstance();

package/source/zipapi/ZipFile.cxx

@@ -1051,11 +1051,7 @@ void ZipFile::getSizeAndCRC( sal_Int32 nOffset, sal_Int32 nCompressedSize, sal_I
         nRealSize += nInBlock;
     }
 
-    if( aInflaterLocal.finished() )
-    {
-        *nSize = nRealSize;
-        *nCRC = aCRC.getValue();
-    }
-    else
-        *nSize = *nCRC = 0;
+    *nSize = nRealSize;
+    *nCRC = aCRC.getValue();
 }
+

setup_native/scripts/admin.pl

@@ -298,6 +298,69 @@ 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.
@@ -880,7 +943,6 @@ sub copy_files_into_directory_structure
     print "Copying files\n";
 
     my $unopkgfile = "";
-    my @extensions = ();
 
     for ( my $i = 1; $i <= $maxsequence; $i++ )
     {
@@ -923,8 +985,6 @@ sub copy_files_into_directory_structure
 
             if ( ! $copyreturn) { exit_program("ERROR: Could not copy $source to $dest\n"); }
 
-            # Collecting all extensions
-            if ( $destfile =~ /\.oxt\s*$/ ) { push(@extensions, $destfile); }
             # Searching unopkg.exe
             if ( $destfile =~ /unopkg\.exe\s*$/ ) { $unopkgfile = $destfile; }
             # if (( $^O =~ /cygwin/i ) && ( $destfile =~ /\.exe\s*$/ )) { change_privileges($destfile, "775"); }
@@ -935,7 +995,7 @@ sub copy_files_into_directory_structure
         # }
     }
 
-    return ($unopkgfile, \@extensions);
+    return ($unopkgfile);
 }
 
 ######################################################
@@ -1026,12 +1086,19 @@ sub get_temppath
 }
 
 ####################################################################################
-# Registering one extension
+# Registering extensions
 ####################################################################################
 
-sub register_one_extension
+sub register_extensions_sync
 {
-    my ($unopkgfile, $extension, $temppath) = @_;
+    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();
 
@@ -1051,22 +1118,17 @@ sub register_one_extension
         $path_displayed = 1;
     }
 
-    $temppath =~ s/\\/\//g;
-    $temppath = "/".$temppath;
-
-    # Converting path of $extension for cygwin
-
-    my $localextension = $extension;
-    if ( $^O =~ /cygwin/i ) {
-        $localextension = qx{cygpath -w "$extension"};
-        $localextension =~ s/\\/\\\\/g;
-    }
+    $localtemppath =~ s/\\/\//g;
 
     if ( $^O =~ /cygwin/i ) {
         $executable = "./" . $executable;
+        $preregdir = qx{cygpath -m "$preregdir"};
+        chomp($preregdir);
     }
 
-    my $systemcall = $executable . " add --shared --verbose --suppress-license " . "\"" . $localextension . "\"" . " -env:UserInstallation=file://" . $temppath . " 2\>\&1 |";
+    $preregdir =~ s/\/\s*$//g;
+
+    my $systemcall = $executable . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file:///" . $preregdir . "\"" . " -env:UserInstallation=file:///" . $localtemppath . " 2\>\&1 |";
 
     print "... $systemcall\n";
 
@@ -1094,26 +1156,20 @@ sub register_one_extension
 
 sub register_extensions
 {
-    my ($unopkgfile, $extensions, $temppath) = @_;
+    my ($unopkgfile, $temppath, $preregdir) = @_;
 
-    if ( $#{$extensions} > -1 )
-    {
-        print "Registering extensions:\n";
+    print "Registering extensions:\n";
 
-        if (( ! -f $unopkgfile ) || ( $unopkgfile eq "" ))
-        {
-            print("WARNING: Could not find unopkg.exe (Language Pack?)!\n");
-        }
-        else
-        {
-            foreach $extension ( @{$extensions} ) { register_one_extension($unopkgfile, $extension, $temppath); }
-            remove_complete_directory($temppath, 1)
-        }
+    if (( ! -f $unopkgfile ) || ( $unopkgfile eq "" ))
+    {
+        print("WARNING: Could not find unopkg.exe (Language Pack?)!\n");
     }
     else
     {
-        print "No extensions to register.\n";
+        register_extensions_sync($unopkgfile, $temppath, $preregdir);
+        remove_complete_directory($temppath, 1);
     }
+
 }
 
 ####################################################################################
@@ -1357,7 +1413,7 @@ my ( $filehash, $fileorder, $maxsequence ) = analyze_file_file($filecontent);
 my $fullpathhash = create_directory_structure($dirhash, $targetdir);
 
 # Copying files
-my ($unopkgfile, $extensions) = copy_files_into_directory_structure($fileorder, $filehash, $componenthash, $fullpathhash, $maxsequence, $unpackdir, $installdir, $dirhash);
+my ($unopkgfile) = 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;
@@ -1369,10 +1425,14 @@ $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, $extensions, $temppath);
+    register_extensions($unopkgfile, $temppath, $preregdir);
 }
 
 # Saving info in Summary Information Stream of msi database (required for following patches)

setup_native/scripts/install_linux.sh

@@ -121,6 +121,14 @@ then
   exit 2
 fi
 
+# #163256# check if we are on a debian system...
+if rpm --help | grep debian >/dev/null;
+then
+    DEBIAN_FLAGS="--force-debian --nodeps"
+else
+    DEBIAN_FLAGS=
+fi
+
 #
 # Determine whether this should be an update or a fresh install
 #
@@ -227,7 +235,7 @@ FAKEDBRPM=/tmp/fake-db-1.0-$$.noarch.rpm
 linenum=???
 tail -n +$linenum $0 > $FAKEDBRPM
 
-rpm --upgrade --ignoresize --dbpath $RPM_DB_PATH $FAKEDBRPM
+rpm ${DEBIAN_FLAGS} --upgrade --ignoresize --dbpath $RPM_DB_PATH $FAKEDBRPM
 
 rm -f $FAKEDBRPM
 
@@ -253,7 +261,7 @@ echo "Installing the RPMs"
 
 ABSROOT=`cd ${INSTALLDIR}; pwd`
 RELOCATIONS=`rpm -qp --qf "--relocate %{PREFIXES}=${ABSROOT}%{PREFIXES} \n" $RPMLIST | sort -u | tr -d "\012"`
-UserInstallation=\$BRAND_BASE_DIR/../UserInstallation rpm $RPMCMD --ignoresize -vh $RELOCATIONS --dbpath $RPM_DB_PATH $RPMLIST
+UserInstallation=\$BRAND_BASE_DIR/../UserInstallation rpm ${DEBIAN_FLAGS} $RPMCMD --ignoresize -vh $RELOCATIONS --dbpath $RPM_DB_PATH $RPMLIST
 
 #
 # Create a link into the users home directory
@@ -268,11 +276,11 @@ if [ "$UPDATE" = "yes" -a ! -f $INSTALLDIR/program/bootstraprc ]
 then
   echo
   echo "Update failed due to a bug in RPM, uninstalling .."
-  rpm --erase -v --nodeps --dbpath $RPM_DB_PATH `rpm --query --queryformat "%{NAME} " --package $RPMLIST --dbpath $RPM_DB_PATH`
+  rpm ${DEBIAN_FLAGS} --erase -v --nodeps --dbpath $RPM_DB_PATH `rpm --query --queryformat "%{NAME} " --package $RPMLIST --dbpath $RPM_DB_PATH`
   echo
   echo "Now re-installing new packages .."
   echo
-  rpm --install --nodeps --ignoresize -vh $RELOCATIONS --dbpath $RPM_DB_PATH $RPMLIST
+  rpm ${DEBIAN_FLAGS} --install --nodeps --ignoresize -vh $RELOCATIONS --dbpath $RPM_DB_PATH $RPMLIST
   echo
 fi
 

setup_native/source/packinfo/package.txt

+DO NOT DELETE THIS FILE
\ No newline at end of file

setup_native/source/win32/customactions/languagepacks/exports.dxp

@@ -2,3 +2,5 @@ SetProductInstallationPath
 RegisterLanguagePack
 GetUserInstallMode    
 IsOfficeRunning
+RegisterExtensions
+

setup_native/source/win32/customactions/languagepacks/makefile.mk

@@ -77,6 +77,7 @@ STDSHL+=	\
 #SHL1LIBS = $(SLB)$/$(TARGET).lib 
 
 SHL1OBJS = $(SLOFILES)              \
+    $(SLO)$/registerextensions.obj  \
     $(SLO)$/seterror.obj
 
 SHL1TARGET = $(TARGET)

setup_native/source/win32/customactions/patch/exports.dxp

@@ -7,3 +7,5 @@ IsOfficeRunning
 SetFeatureState
 SetNewFeatureState
 ShowOnlineUpdateDialog
+RegisterExtensions
+RemoveExtensions

setup_native/source/win32/customactions/patch/makefile.mk

@@ -76,6 +76,7 @@ SHL1OBJS = $(SLOFILES)               \
     $(SLO)$/shutdown_quickstart.obj  \
     $(SLO)$/quickstarter.obj         \
     $(SLO)$/upgrade.obj              \
+        $(SLO)$/registerextensions.obj   \
     $(SLO)$/seterror.obj
 
 SHL1TARGET = $(TARGET)

setup_native/source/win32/customactions/shellextensions/exports.dxp

@@ -7,6 +7,8 @@ RebuildShellIconCache
 ExecutePostUninstallScript
 CompleteInstallPath
 MigrateInstallPath
+RegisterExtensions
+RemoveExtensions
 CheckInstallDirectory
 SetAdminInstallProperty
 CreateLayerLinks

setup_native/source/win32/customactions/shellextensions/makefile.mk

@@ -63,6 +63,7 @@ SLOFILES = \
     $(SLO)$/setadmininstall.obj \
     $(SLO)$/layerlinks.obj \
     $(SLO)$/dotnetcheck.obj \
+    $(SLO)$/registerextensions.obj \
     $(SLO)$/copyeditiondata.obj \
     $(SLO)$/vistaspecial.obj \
     $(SLO)$/checkrunningoffice.obj \