Author: mladen.turk(a)jboss.com Date: 2008-03-06 14:45:00 -0500 (Thu, 06 Mar 2008) New Revision: 1430 Modified: trunk/build/unix/build.sh Log: Correctly format package.build file so it reflects new syntax for packages Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2008-03-06 19:44:12 UTC (rev 1429) +++ trunk/build/unix/build.sh 2008-03-06 19:45:00 UTC (rev 1430) @@ -200,39 +200,46 @@ if [ "$apu_type" = "v" ]; then has_apu=true fi + apu_sversion="apu:$apu_type:$apu_version" export apu_version ;; api:*) api_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` api_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` has_api=true + api_sversion="api:$api_type:$api_version" export api_version ;; ssl:*) ssl_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` ssl_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` has_ssl=true + ssl_sversion="ssl:$ssl_type:$ssl_version" ;; zlib:*) zlib_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` zlib_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` has_zlib=true + zlib_sversion="zlib:$zlib_type:$zlib_version" ;; jk:*) jk_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` jk_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` has_jk=true + jk_sversion="jk:$jk_type:$jk_version" export jk_version ;; iconv:*) iconv_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` iconv_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` has_iconv=true + iconv_sversion="iconv:$iconv_type:$iconv_version" ;; expat:*) expat_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` expat_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` has_expat=true + expat_sversion="expat:$expat_type:$expat_version" ;; esac fi @@ -1062,7 +1069,7 @@ cat > ${package_src_dir}/package.build << EOF # THIS FILE WAS AUTOGENERATED BY `basename $0` # -${PACKAGE}|${build_version}|${svn_tagname}|${apr_sversion}|${apu_version}|${api_version}|${ssl_version}|${zlib_version}|${jk_version} +${PACKAGE}|${build_version}|${svn_tagname}|${apr_sversion}|${apu_sversion}|${api_sversion}|${ssl_sversion}|${zlib_sversion}|${jk_sversion} EOF