Chameleon

Chameleon Commit Details

Date:2011-10-26 10:54:45 (12 years 6 months ago)
Author:ErmaC
Commit:1666
Parents: 1665
Message:Small correction into buildpkg and slimpkg, update Chinese Language thx crazybirdy. Add for test { 0x6720, 0x04BA1028, CHIP_FAMILY_BARTS, "AMD Radeon HD 6970m", kElodea },
Changes:
M/branches/ErmaC/Modules/package/Resources/zh_TW.lproj/Localizable.strings
M/branches/ErmaC/Trunk/package/Resources/zh_CN.lproj/Localizable.strings
M/branches/ErmaC/Trunk/package/buildpkg.sh
M/branches/ErmaC/Modules/package/Resources/zh_CN.lproj/Localizable.strings
M/branches/ErmaC/Trunk/i386/libsaio/ati.c
M/branches/ErmaC/Modules/package/buildpkg.sh
M/branches/ErmaC/Trunk/package/slimpkg.sh
M/branches/ErmaC/Trunk/package/Resources/zh_TW.lproj/Localizable.strings
M/branches/ErmaC/Modules/package/slimpkg.sh

File differences

branches/ErmaC/Trunk/i386/libsaio/ati.c
559559
560560
561561
562
562
563563
564564
565565
␉␊
␉{ 0x6718,␉0x31301682, CHIP_FAMILY_CAYMAN,␉␉"AMD Radeon HD 6970",␉␉␉␉kNull␉␉},␊
␊
␉{ 0x6720,␉0x04BA1028, CHIP_FAMILY_CAYMAN,␉␉"AMD Radeon HD 6970m",␉␉␉␉kElodea␉␉}, // ErmaC no tested␊
␉{ 0x6720,␉0x04BA1028, CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6970m",␉␉␉␉kElodea␉␉}, // ErmaC no tested␊
␊
␉{ 0x6738,␉0x00D01002, CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6870",␉␉␉␉kDuckweed␉},␊
␉{ 0x6738,␉0x21FA1002, CHIP_FAMILY_BARTS,␉␉"AMD Radeon HD 6870",␉␉␉␉kDuckweed␉},␊
branches/ErmaC/Trunk/package/slimpkg.sh
8888
8989
9090
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
91116
92117
93118
␉buildpackage "${1}/Core" "/" "0" "start_visible=\"false\" start_selected=\"true\"" >/dev/null 2>&1␊
# End build core package␊
␊
# build install type␊
␉echo "================= Chameleon ================="␊
␉outline[$((outlinecount++))]="${indent[$xmlindent]}<line choice=\"InstallType\">"␊
␉choices[$((choicescount++))]="\t<choice\n\t\tid=\"InstallType\"\n\t\ttitle=\"InstallType_title\"\n\t\tdescription=\"InstallType_description\">\n\t</choice>\n"␊
␉((xmlindent++))␊
␉packagesidentity="org.chameleon.type"␊
␉␊
␉# build new install package ␊
␉␉mkdir -p ${1}/New/Root␊
␉␉echo "" > "${1}/New/Root/install_type_new"␊
␉␉echo "␉[BUILD] New "␊
buildpackage "${1}/New" "/$chamTemp" "" "start_enabled=\"true\" selected=\"exclusive(choices['Upgrade'])\"" >/dev/null 2>&1␊
␉# End build new install package ␊
␊
␉# build upgrade package ␊
␉␉mkdir -p ${1}/Upgrade/Root␊
␉␉echo "" > "${1}/Upgrade/Root/install_type_upgrade"␊
␉␉echo "␉[BUILD] Upgrade "␊
␉␉buildpackage "${1}/Upgrade" "/$chamTemp" "" "start_selected=\"false\" selected=\"exclusive(choices['New'])\"" >/dev/null 2>&1␊
␉# End build upgrade package␊
␊
((xmlindent--))␊
outline[$((outlinecount++))]="${indent[$xmlindent]}</line>"␊
# End build install type␉␊
␊
# build Chameleon package␊
␉echo "================= Chameleon ================="␊
␉outline[$((outlinecount++))]="${indent[$xmlindent]}<line choice=\"Chameleon\">"␊
branches/ErmaC/Trunk/package/buildpkg.sh
340340
341341
342342
343
343
344344
345345
346346
347
347
348348
349349
350350
......
472472
473473
474474
475
475
476476
477477
478478
......
507507
508508
509509
510
510
511511
512512
513513
......
588588
589589
590590
591
591
592592
␊
# build meta package␊
␊
␉makedistribution "${1}" "${2}" "${3}" "${4}" #"${5}"␊
␉makedistribution "${1}" "${2}" "${3}" "${4}" "${5}"␊
␊
# clean up ␊
␊
␉#rm -R -f "${1}"␊
␉rm -R -f "${1}"␊
␊
}␊
␊
␊
␉header+="auth=\"root\">\n"␊
␉header+="\t<payload installKBytes=\"${installedsize##* }\" numberOfFiles=\"${filecount##* }\"/>\n"␊
␉#rm -R -f "${1}/Temp"␊
␉rm -R -f "${1}/Temp"␊
␊
␉[ -d "${1}/Temp" ] || mkdir -m 777 "${1}/Temp"␊
␉[ -d "${1}/Root" ] && mkbom "${1}/Root" "${1}/Temp/Bom"␊
␉␉local choiceoptions="\t\t${4}"␊
␉fi␊
␉choices[$((choicescount++))]="\t<choice\n\t\tid=\"${packagename// /}\"\n\t\ttitle=\"${packagename}_title\"\n\t\tdescription=\"${packagename}_description\"\n${choiceoptions}>\n\t\t<pkg-ref id=\"${identifier}\" installKBytes='${installedsize}' version='${version}.0.0.${timestamp}' >#${packagename// /}.pkg</pkg-ref>\n\t</choice>\n"␉␊
␉#rm -R -f "${1}"␊
␉rm -R -f "${1}"␊
fi␊
}␊
␊
␊
}␊
␊
main "${1}" "${2}" "${3}" "${4}" #"${5}"␊
main "${1}" "${2}" "${3}" "${4}" "${5}"␊
␊
branches/ErmaC/Modules/package/slimpkg.sh
8888
8989
9090
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
91116
92117
93118
␉buildpackage "${1}/Core" "/" "0" "start_visible=\"false\" start_selected=\"true\"" >/dev/null 2>&1␊
# End build core package␊
␊
# build install type␊
␉echo "================= Chameleon ================="␊
␉outline[$((outlinecount++))]="${indent[$xmlindent]}<line choice=\"InstallType\">"␊
␉choices[$((choicescount++))]="\t<choice\n\t\tid=\"InstallType\"\n\t\ttitle=\"InstallType_title\"\n\t\tdescription=\"InstallType_description\">\n\t</choice>\n"␊
␉((xmlindent++))␊
␉packagesidentity="org.chameleon.type"␊
␉␊
␉# build new install package ␊
␉␉mkdir -p ${1}/New/Root␊
␉␉echo "" > "${1}/New/Root/install_type_new"␊
␉␉echo "␉[BUILD] New "␊
buildpackage "${1}/New" "/$chamTemp" "" "start_enabled=\"true\" selected=\"exclusive(choices['Upgrade'])\"" >/dev/null 2>&1␊
␉# End build new install package ␊
␊
␉# build upgrade package ␊
␉␉mkdir -p ${1}/Upgrade/Root␊
␉␉echo "" > "${1}/Upgrade/Root/install_type_upgrade"␊
␉␉echo "␉[BUILD] Upgrade "␊
␉␉buildpackage "${1}/Upgrade" "/$chamTemp" "" "start_selected=\"false\" selected=\"exclusive(choices['New'])\"" >/dev/null 2>&1␊
␉# End build upgrade package␊
␊
((xmlindent--))␊
outline[$((outlinecount++))]="${indent[$xmlindent]}</line>"␊
# End build install type␉␊
␊
# build Chameleon package␊
␉echo "================= Chameleon ================="␊
␉outline[$((outlinecount++))]="${indent[$xmlindent]}<line choice=\"Chameleon\">"␊
branches/ErmaC/Modules/package/buildpkg.sh
380380
381381
382382
383
383
384384
385385
386386
387
387
388388
389389
390390
......
512512
513513
514514
515
515
516516
517517
518518
......
547547
548548
549549
550
550
551551
552552
553553
......
628628
629629
630630
631
631
632632
␊
# build meta package␊
␊
␉makedistribution "${1}" "${2}" "${3}" "${4}" #"${5}"␊
␉makedistribution "${1}" "${2}" "${3}" "${4}" "${5}"␊
␊
# clean up ␊
␊
␉#rm -R -f "${1}"␊
␉rm -R -f "${1}"␊
␊
}␊
␊
␊
␉header+="auth=\"root\">\n"␊
␉header+="\t<payload installKBytes=\"${installedsize##* }\" numberOfFiles=\"${filecount##* }\"/>\n"␊
␉#rm -R -f "${1}/Temp"␊
␉rm -R -f "${1}/Temp"␊
␊
␉[ -d "${1}/Temp" ] || mkdir -m 777 "${1}/Temp"␊
␉[ -d "${1}/Root" ] && mkbom "${1}/Root" "${1}/Temp/Bom"␊
␉␉local choiceoptions="\t\t${4}"␊
␉fi␊
␉choices[$((choicescount++))]="\t<choice\n\t\tid=\"${packagename// /}\"\n\t\ttitle=\"${packagename}_title\"\n\t\tdescription=\"${packagename}_description\"\n${choiceoptions}>\n\t\t<pkg-ref id=\"${identifier}\" installKBytes='${installedsize}' version='${version}.0.0.${timestamp}' >#${packagename// /}.pkg</pkg-ref>\n\t</choice>\n"␉␊
␉#rm -R -f "${1}"␊
␉rm -R -f "${1}"␊
fi␊
}␊
␊
␊
}␊
␊
main "${1}" "${2}" "${3}" "${4}" #"${5}"␊
main "${1}" "${2}" "${3}" "${4}" "${5}"␊
␊

Archive Download the corresponding diff file

Revision: 1666