[haiku-commits] r37622 - haiku/trunk/data/bin

From: mattmadia@xxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Tue, 20 Jul 2010 18:48:21 +0200 (CEST)
Author: mmadia
Date: 2010-07-20 18:48:21 +0200 (Tue, 20 Jul 2010)
New Revision: 37622
Changeset: http://dev.haiku-os.org/changeset/37622

Modified:
   haiku/trunk/data/bin/installoptionalpackage
Log:
Added ICU and ICU-devel to the list of packages that cannot be installed. ATM,
for loops aren't handled and the variables used by ICU and ICU-devel are not
parsed. Added TODO's and commented+untested code for now.


Modified: haiku/trunk/data/bin/installoptionalpackage
===================================================================
--- haiku/trunk/data/bin/installoptionalpackage 2010-07-20 16:12:15 UTC (rev 
37621)
+++ haiku/trunk/data/bin/installoptionalpackage 2010-07-20 16:48:21 UTC (rev 
37622)
@@ -42,7 +42,8 @@
 # Some Packages cannot be installed,
 # as they require either the source code or compiled binaries
 declare packageIgnoreList="Bluetooth Development DevelopmentMin \
-DevelopmentBase MandatoryPackages UserlandFS Welcome WifiFirmwareScriptData "
+DevelopmentBase MandatoryPackages UserlandFS Welcome WifiFirmwareScriptData \
+ICU-devel ICU "
 
 
 function CreateInstallerScript()
@@ -633,6 +634,23 @@
        countGenBashLine=0
 
        # Parse out some variable declarations
+
+       # TODO : add these following variables to the CreateInstallerScript
+       # TODO : parse HAIKU_ICU_GCC_2_PACKAGE
+       #local regExp='/^HAIKU_ICU_GCC_2_PACKAGE/p'
+       #icuGcc2PkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
+       #ConvertVariableDeclarationLines "$regExp" 'icuGcc2PkgLine'
+
+       # TODO : parse HAIKU_ICU_GCC_4_PACKAGE
+       #local regExp='/^HAIKU_ICU_GCC_4_PACKAGE/p'
+       #icuGcc4PkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
+       #ConvertVariableDeclarationLines "$regExp" 'icuGcc4PkgLine'
+
+       # TODO : parse HAIKU_ICU_DEVEL_PACKAGE
+       #local regExp='/^HAIKU_ICU_DEVEL_PACKAGE/p'
+       #icuDevelPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
+       #ConvertVariableDeclarationLines "$regExp" 'icuDevelPkgLine'
+
        local regExp='/^HAIKU_OPENSSL_PACKAGE/p'
        sslPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
        ConvertVariableDeclarationLines "$regExp" 'sslPkgLine'
@@ -650,6 +668,8 @@
        while read line ; do
                line=${line/'Echo'/'echo'}
 
+               # TODO: add support for converting for loops.
+               #               will need to introduce curly brace counting
                ConvertIfStatements "$line"
                ConvertVariables "$line"
                #ReplaceComparators "$line"
[haiku-commits] r37622 - haiku/trunk/data/bin

Other related posts:
