Chameleon

Chameleon Commit Details

Date:2012-11-14 01:12:43 (11 years 5 months ago)
Author:ErmaC
Commit:2119
Parents: 2118
Message:Correct mistake into template Localizable.strings file Now the descriptions for all the module will be show correctly. Set default environment variables for UTF-8 and C Now the pkg background is shown again.
Changes:
M/branches/ErmaC/Trunk/package/buildpkg.sh
M/branches/ErmaC/Trunk/i386/libsaio/nvidia.c
M/branches/ErmaC/Trunk/i386/boot2/options.c
M/branches/ErmaC/Trunk/package/Resources/templates/Localizable.strings

File differences

branches/ErmaC/Trunk/i386/libsaio/nvidia.c
620620
621621
622622
623
623624
624625
625626
␉// 06C0 - 06CF␊
␉{ 0x10DE06C0,␉0x10438359,␉"Asus GeForce GTX 480" },␊
␉{ 0x10DE06C0,␉0x10DE075F,␉"nVidia GeForce GTX 480" },␊
␉{ 0x10DE06C0,␉0x19DA1152,␉"Zotac GeForce GTX 480" },␊
␉{ 0x10DE06C0,␉0x38421480,␉"EVGA GTX 480" },␊
␉{ 0x10DE06C0,␉0x38421482,␉"EVGA GTX 480" },␊
␊
branches/ErmaC/Trunk/i386/boot2/options.c
270270
271271
272272
273
273
274274
275275
276276
277277
278278
279279
280
280
281281
282282
283283
......
10131013
10141014
10151015
1016
1017
1016
1017
1018
1019
10181020
10191021
10201022
......
10301032
10311033
10321034
1033
1035
1036
10341037
10351038
10361039
......
10431046
10441047
10451048
1046
1049
10471050
10481051
10491052
......
11221125
11231126
11241127
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
11381148
11391149
11401150
{␊
updateGraphicBootPrompt();␊
}␊
} ␊
}␊
␉␉␉break;␊
␊
default:␊
if ( key >= ' ' && gBootArgsPtr < gBootArgsEnd)␊
{␊
*gBootArgsPtr++ = key;␊
␊
␊
if( bootArgs->Video.v_display != VGA_TEXT_MODE ) updateGraphicBootPrompt();␊
else if ( key >= ' ' && key < 0x7f) putchar(key);␊
␉␉␉}␊
␉␉␉// New behavior:␊
␉␉␉// Switch between text & graphic interfaces␊
␉␉␉// Only Permitted if started in graphics interface␊
␉␉␉if (useGUI) {␊
␉␉␉␉if (bootArgs->Video.v_display != VGA_TEXT_MODE) {␊
␉␉␉if (useGUI)␊
␉␉␉{␊
␉␉␉␉if (bootArgs->Video.v_display != VGA_TEXT_MODE)␊
␉␉␉␉{␊
␉␉␉␉␉setVideoMode(VGA_TEXT_MODE, 0);␊
␊
␉␉␉␉␉setCursorPosition(0, 0, 0);␊
␉␉␉␉␉nextRow = kMenuTopRow;␊
␉␉␉␉␉showPrompt = true;␊
␊
␉␉␉␉␉if (gDeviceCount) {␊
␉␉␉␉␉if (gDeviceCount)␊
␉␉␉␉␉{␊
␉␉␉␉␉␉printf("Use \30\31 keys to select the startup volume.");␊
␉␉␉␉␉␉showMenu(menuItems, gDeviceCount, selectIndex, kMenuTopRow + 2, kMenuMaxItems);␊
␉␉␉␉␉␉nextRow += MIN(gDeviceCount, kMenuMaxItems) + 3;␊
␉␉␉␉␉gui.redraw = true;␊
␉␉␉␉␉setVideoMode(GRAPHICS_MODE, 0);␊
␉␉␉␉␉updateVRAM();␊
updateGraphicBootPrompt();␊
␉␉␉updateGraphicBootPrompt();␊
␉␉␉␉}␊
␉␉␉}␊
␉␉␉key = 0;␊
int cnt;␊
bool found = false;␊
␊
if (getValueForBootKey(userString, argName, &val, &cnt)) {␊
// Don't copy; these values will be copied at the end of argument processing.␊
found = true;␊
} else if (getValueForBootKey(kernelFlags, argName, &val, &cnt)) {␊
// Don't copy; these values will be copied at the end of argument processing.␊
found = true;␊
} else if (getValueForKey(argName, &val, &cnt, &bootInfo->chameleonConfig)) {␊
copyArgument(argName, val, cnt, argP, cntRemainingP);␊
found = true;␊
}␊
if (found && foundVal)␊
strlcpy(foundVal, val, foundValSize);␊
return found;␊
␉if (getValueForBootKey(userString, argName, &val, &cnt))␊
␉{␊
␉␉// Don't copy; these values will be copied at the end of argument processing.␊
␉␉found = true;␊
␉}␊
␉else if (getValueForBootKey(kernelFlags, argName, &val, &cnt))␊
␉{␊
␉␉// Don't copy; these values will be copied at the end of argument processing.␊
␉␉found = true;␊
␉}␊
␉else if (getValueForKey(argName, &val, &cnt, &bootInfo->chameleonConfig))␊
␉{␊
␉␉copyArgument(argName, val, cnt, argP, cntRemainingP);␊
␉␉found = true;␊
␉}␊
␉if (found && foundVal)␊
␉{␊
␉␉strlcpy(foundVal, val, foundValSize);␊
␉}␊
␉return found;␊
}␊
␊
// Maximum config table value size␊
branches/ErmaC/Trunk/package/Resources/templates/Localizable.strings
6262
6363
6464
65
66
67
68
65
66
67
68
6969
7070
7171
72
72
7373
7474
7575
␊
"KernelPatcher_title" = "Kernel Patcher";␊
"KernelPatcher_description" = "The KernelPatcher module provides patches for the following:␊
Enables the use of the kernelcache with /Extra/Extensions and /Extra/Extensions.mkext␊
Removed the CPUID check␊
Removes an LAPIC panic␊
Removes a panic in commpage_stuff_routine␊
*Enables the use of the kernelcache with /Extra/Extensions and /Extra/Extensions.mkext␊
*Removed the CPUID check␊
*Removes an LAPIC panic␊
*Removes a panic in commpage_stuff_routine␊
Dependencies: none";␊
␊
"KextPatcher_title" = "Kext Patcher";␊
"KernelPatcher_description" = "The KextPatcher module provides patches for the following:␊
"KextPatcher_description" = "The KextPatcher module provides patches for the following:␊
Dependencies: none";␊
␊
// ============================================================================␊
branches/ErmaC/Trunk/package/buildpkg.sh
2323
2424
2525
26
27
2628
2729
2830
2931
3032
33
34
35
36
3137
38
39
3240
33
34
35
36
3741
3842
3943
......
557561
558562
559563
560
564
561565
562566
563567
......
576580
577581
578582
579
583
580584
581585
582586
set -u # Abort with unset variables␊
#set -e # Abort with any error can be suppressed locally using EITHER cmd||true OR set -e;cmd;set +e␊
␊
# ====== LANGUAGE SETUP ======␊
export LANG='en_US.UTF-8'␊
export LC_COLLATE='C'␊
export LC_CTYPE='C'␊
␊
# ====== CONFIGURATION ======␊
CONFIG_MODULES=""␊
CONFIG_ACPICODEC_MODULE=""␊
CONFIG_KERNELPATCHER_MODULE=""␊
CONFIG_KEXTPATCHER_MODULE=""␊
CONFIG_KEYLAYOUT_MODULE=""␊
CONFIG_KLIBC_MODULE=""␊
CONFIG_RESOLUTION_MODULE=""␊
CONFIG_SATA_MODULE=""␊
CONFIG_UCLIBCXX_MODULE=""␊
CONFIG_SATA_MODULE=""␊
CONFIG_ACPICODEC_MODULE=""␊
CONFIG_RESOLUTION_MODULE=""␊
CONFIG_KEYLAYOUT_MODULE=""␊
source "${SRCROOT}/auto.conf"␊
␊
# ====== COLORS ======␊
}␊
fi␊
# -␊
if [[ "${CONFIG_RESOLUTION_MODULE}" == 'm' && -f "${SYMROOT}/i386/modules/KernelPatcher.dylib" ]]; then␊
if [[ "${CONFIG_KERNELPATCHER_MODULE}" == 'y' && -f "${SYMROOT}/i386/modules/KernelPatcher.dylib" ]]; then␊
{␊
# Start build KernelPatcher package module␊
choiceId="KernelPatcher"␊
}␊
fi␊
# -␊
if [[ "${CONFIG_RESOLUTION_MODULE}" == 'm' && -f "${SYMROOT}/i386/modules/KextPatcher.dylib" ]]; then␊
if [[ "${CONFIG_KEXTPATCHER_MODULE}" == 'y' && -f "${SYMROOT}/i386/modules/KextPatcher.dylib" ]]; then␊
{␊
# Start build KextPatcher package module␊
choiceId="KextPatcher"␊

Archive Download the corresponding diff file

Revision: 2119