fix for bug#57340; custom components not showing up in build;added additional field

This commit is contained in:
varada%netscape.com 2000-12-08 04:00:29 +00:00
parent b48c49ffe4
commit 605f245267
3 changed files with 14 additions and 2 deletions

View File

@ -49,6 +49,8 @@ int BuildComponentList(COMPONENT *comps, int *compNum, CString iniSrcPath,int in
comps[*compNum].selected = (strstr(attr, "SELECTED") != NULL);
comps[*compNum].invisible = (strstr(attr, "INVISIBLE") != NULL);
comps[*compNum].launchapp = (strstr(attr, "LAUNCHAPP") != NULL);
comps[*compNum].additional = (strstr(attr, "ADDITIONAL") != NULL);
if (!(comps[*compNum].selected && comps[*compNum].invisible && invisibleCount))
{

View File

@ -6,6 +6,7 @@ typedef struct s_component {
BOOL selected;
BOOL invisible;
BOOL launchapp;
BOOL additional;
} COMPONENT;
extern "C" __declspec(dllexport)

View File

@ -545,9 +545,16 @@ void init_components()
// Turn off components that aren't selected
for (i=0; i<numComponents; i++)
if ((strstr(w->value, Components[i].name) == NULL) && (!(Components[i].selected && Components[i].invisible)))
{
if ((strstr(w->value, Components[i].name) == NULL))
{
if (!(Components[i].selected && Components[i].invisible))
Components[i].selected = FALSE;
}
else
if (Components[i].additional)
Components[i].selected = TRUE;
}
}
/*Post Beta - we will use the DISABLED key.
Now this is implemented the round about way here.
@ -583,6 +590,8 @@ void invisible()
Cee.Format("C%d", componentOrder);
WritePrivateProfileString("Setup Type0",(LPCTSTR)Cee,(LPCTSTR)component, iniDstPath);
WritePrivateProfileString("Setup Type1",(LPCTSTR)Cee,(LPCTSTR)component, iniDstPath);
if (Components[i].additional && !(Components[i].launchapp) && !(Components[i].invisible))
WritePrivateProfileString(Components[i].compname, "Attributes", "SELECTED|ADDITIONAL", iniDstPath);
componentOrder++;
}
else