solenv/bin/modules/installer/globals.pm | 1
solenv/bin/modules/installer/systemactions.pm | 44 -----------------------
solenv/bin/modules/installer/windows/property.pm | 11 +----
3 files changed, 2 insertions(+), 54 deletions(-)
New commits:
commit 61b899e4b6b10c78daa818751e341f0c69e6f3d7
Author: Tim Retout <t...@retout.co.uk>
Date: Mon Sep 3 08:53:09 2012 +0100
installer: Remove copy_complete_directory_without_cvs
Change-Id: I8ae43356f91c45aecfe56cb83567b5e4e97c5669
diff --git a/solenv/bin/modules/installer/systemactions.pm
b/solenv/bin/modules/installer/systemactions.pm
index 7f9b2a8..702b6fe 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -629,50 +629,6 @@ sub copy_complete_directory
}
}
-#####################################################################################
-# Copying a complete directory with sub directories, but not the CVS
directories.
-#####################################################################################
-
-sub copy_complete_directory_without_cvs
-{
- my ($sourcedir, $destdir) = @_;
-
- my @sourcefiles = ();
-
- $sourcedir =~ s/\Q$installer::globals::separator\E\s*$//;
- $destdir =~ s/\Q$installer::globals::separator\E\s*$//;
-
- if ( ! -d $destdir ) { create_directory($destdir); }
-
- my $infoline = "\n";
- push(@installer::globals::logfileinfo, $infoline);
- $infoline = "Copying files from directory $sourcedir to directory $destdir
(without CVS)\n";
- push(@installer::globals::logfileinfo, $infoline);
-
- opendir(DIR, $sourcedir);
- @sourcefiles = readdir(DIR);
- closedir(DIR);
-
- my $onefile;
-
- foreach $onefile (@sourcefiles)
- {
- if ((!($onefile eq ".")) && (!($onefile eq "..")) && (!($onefile eq
"CVS")))
- {
- my $source = $sourcedir . $installer::globals::separator .
$onefile;
- my $dest = $destdir . $installer::globals::separator . $onefile;
- if ( -f $source ) # only files, no directories
- {
- copy_one_file($source, $dest);
- }
- if ( -d $source ) # recursive
- {
- copy_complete_directory_without_cvs($source, $dest);
- }
- }
- }
-}
-
#####################################################
# Copying all files with a specified file extension
# from one directory to another directory.
commit 3c47a63dc4bc9dee8f242a93e27c9641da6bded5
Author: Tim Retout <t...@retout.co.uk>
Date: Sun Sep 2 21:06:37 2012 +0100
installer: Inline $installer::globals::required_dotnet_version
Change-Id: I653cee6f86476520d12eaa42c2afecdad1e75dc0
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index 1cd549e..e4cee55 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -44,7 +44,6 @@ BEGIN
$destdir = "";
$rootpath = "";
- $required_dotnet_version = "2.0.0.0";
$productextension = "";
@languageproducts = ();
$build = "";
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 6e70a1c..519d2e1 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -399,15 +399,8 @@ sub set_important_properties
}
# Setting .NET requirements
- if ( $installer::globals::required_dotnet_version ne "" )
- {
- my $onepropertyline = "REQUIRED_DOTNET_VERSION" . "\t" .
$installer::globals::required_dotnet_version . "\n";
- push(@{$propertyfile}, $onepropertyline);
-
- $onepropertyline = "DOTNET_SUFFICIENT" . "\t" . "1" . "\n"; # default
value for found .NET
- push(@{$propertyfile}, $onepropertyline);
- }
-
+ push @{$propertyfile}, "REQUIRED_DOTNET_VERSION" . "\t" . "2.0.0.0" . "\n";
+ push @{$propertyfile}, "DOTNET_SUFFICIENT" . "\t" . "1" . "\n"; # default
value for found .NET
}
#######################################################
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
