solenv/bin/modules/installer/windows/feature.pm | 10 ----------
1 file changed, 10 deletions(-)
New commits:
commit 1aa1a1c71de6604cd2c45e393ba3194c3d85bc9a
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun Feb 8 09:09:49 2015 +0100
FeatureLevel is never set in .scp files
Change-Id: I95102008679e427483c4a95aa0422481ceb3d45e
diff --git a/solenv/bin/modules/installer/windows/feature.pm
b/solenv/bin/modules/installer/windows/feature.pm
index 5e39dfa..84d4e99 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -134,10 +134,6 @@ sub get_feature_level
$level = "200"; # deselected in default installation, base
is 100
}
- # if FeatureLevel is defined in scp, this will be used
-
- if ( $onefeature->{'FeatureLevel'} ) { $level =
$onefeature->{'FeatureLevel'}; }
-
return $level
}
commit b84e00385e5def5d94134193bf431cc36d6f7b0f
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun Feb 8 09:08:24 2015 +0100
Feature level +40 has no effect in our Windows installer
Change-Id: I670ee5fc6a6b6debad681b85964901bb51656c35
diff --git a/solenv/bin/modules/installer/windows/feature.pm
b/solenv/bin/modules/installer/windows/feature.pm
index dacb06b..5e39dfa 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -134,12 +134,6 @@ sub get_feature_level
$level = "200"; # deselected in default installation, base
is 100
}
- # special handling for Java and Ada
- if ( $onefeature->{'Name'} )
- {
- if ( $onefeature->{'Name'} =~ /java/i ) { $level = $level + 40; }
- }
-
# if FeatureLevel is defined in scp, this will be used
if ( $onefeature->{'FeatureLevel'} ) { $level =
$onefeature->{'FeatureLevel'}; }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
