From f286792113375731e03588259f56e39a742ae196 Mon Sep 17 00:00:00 2001
From: Matt Madia <mattmadia@gmail.com>
Date: Tue, 20 Jul 2010 16:48:21 +0000
Subject: [PATCH] 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.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37622 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 data/bin/installoptionalpackage | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/data/bin/installoptionalpackage b/data/bin/installoptionalpackage
index 490978ced9..44dea4c9ff 100755
--- a/data/bin/installoptionalpackage
+++ b/data/bin/installoptionalpackage
@@ -42,7 +42,8 @@ declare alreadyInstalled=""
 # 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 @@ function ConvertJamToBash()
 	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 @@ function ConvertJamToBash()
 	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"