diff options
Diffstat (limited to 'command_line/CmdLine/Src')
| -rw-r--r-- | command_line/CmdLine/Src/CLMain.c | 441 | ||||
| -rw-r--r-- | command_line/CmdLine/Src/Clients/ClientGlue.c | 2 | ||||
| -rw-r--r-- | command_line/CmdLine/Src/Envir/CLIO.c | 6 | ||||
| -rw-r--r-- | command_line/CmdLine/Src/MacEmul/ResourceStrings.c | 4 | ||||
| -rw-r--r-- | command_line/CmdLine/Src/OSLib/Posix.c | 2 |
5 files changed, 357 insertions, 98 deletions
diff --git a/command_line/CmdLine/Src/CLMain.c b/command_line/CmdLine/Src/CLMain.c index c4d782b..065ae5b 100644 --- a/command_line/CmdLine/Src/CLMain.c +++ b/command_line/CmdLine/Src/CLMain.c @@ -1,10 +1,28 @@ #include "mwcc_decomp.h" -static short CLT_dummymain(void *context) { +jmp_buf exit_program; +int numPlugins; +CLPluginInfo *pluginInfo; +int numPanels; +char **panelNames; +CWCommandLineArgs *panel_args; +CWCommandLineArgs *plugin_args; +Project mainProj; +Target *gTarg; +PCmdLine optsCmdLine; +PCmdLineEnvir optsEnvir; +PCmdLineCompiler optsCompiler; +PCmdLineLinker optsLinker; +CLState clState; +char cmdline_build_date[32]; +char cmdline_build_time[32]; +Project *gProj = &mainProj; + +static SInt16 CLT_dummymain(void *context) { return 0; } -static short CLT_GetDropInFlags(const DropInFlags **flags, long *flagsSize) { +static SInt16 CLT_GetDropInFlags(const DropInFlags **flags, SInt32 *flagsSize) { static const DropInFlags sFlags = { kCurrentDropInFlagsVersion, CWFOURCHAR('c','l','d','r'), @@ -18,19 +36,19 @@ static short CLT_GetDropInFlags(const DropInFlags **flags, long *flagsSize) { return 0; } -static short CLT_GetDropInName(const char **dropinName) { +static SInt16 CLT_GetDropInName(const char **dropinName) { static const char *sDropInName = "Command-Line Driver"; *dropinName = sDropInName; return 0; } -static short CLT_GetDisplayName(const char **displayName) { +static SInt16 CLT_GetDisplayName(const char **displayName) { static const char *sDisplayName = "Command-Line Driver"; *displayName = sDisplayName; return 0; } -static short CLT_GetPanelList(const CWPanelList **panelList) { +static SInt16 CLT_GetPanelList(const CWPanelList **panelList) { static const char *sPanelNames[4]; static CWPanelList sPanelList = { kCurrentCWPanelListVersion, @@ -38,12 +56,13 @@ static short CLT_GetPanelList(const CWPanelList **panelList) { sPanelNames }; - sPanelNames[0] = "CmdLine Panel"; if (clState.plugintype == CWDROPINCOMPILERTYPE) { + sPanelNames[0] = "CmdLine Panel"; sPanelNames[1] = "CmdLine Compiler Panel"; sPanelNames[2] = "CmdLine Linker Panel"; sPanelList.count = 3; } else { + sPanelNames[0] = "CmdLine Panel"; sPanelNames[1] = "CmdLine Linker Panel"; sPanelList.count = 2; } @@ -51,9 +70,9 @@ static short CLT_GetPanelList(const CWPanelList **panelList) { return 0; } -static short CLT_GetTargetList(const CWTargetList **targetList) { - static CWDataType sCPU = CWFOURCHAR('*','*','*','*'); - static CWDataType sOS = CWFOURCHAR('*','*','*','*'); +static SInt16 CLT_GetTargetList(const CWTargetList **targetList) { + static FourCharCode sCPU = CWFOURCHAR('*','*','*','*'); + static FourCharCode sOS = CWFOURCHAR('*','*','*','*'); static CWTargetList sTargetList = { kCurrentCWTargetListVersion, 1, @@ -65,7 +84,7 @@ static short CLT_GetTargetList(const CWTargetList **targetList) { return 0; } -static short CLT_GetVersionInfo(const VersionInfo **versioninfo) { +static SInt16 CLT_GetVersionInfo(const VersionInfo **versioninfo) { static const VersionInfo vi = { 3, 0, 0, 0 }; @@ -73,7 +92,7 @@ static short CLT_GetVersionInfo(const VersionInfo **versioninfo) { return 0; } -static short CLT_GetFileTypeMappings(const OSFileTypeMappingList **mappinglist) { +static SInt16 CLT_GetFileTypeMappings(const OSFileTypeMappingList **mappinglist) { static const OSFileTypeMapping ftmes[2] = { {CWFOURCHAR('B','r','w','s'), "DubL", 4, 0, 0}, {CWFOURCHAR('M','M','P','r'), "looc", 4, 0, 0} @@ -102,14 +121,13 @@ static int RegisterStaticCmdLinePlugin() { return RegisterStaticPlugin(&clcb); } -// TODO do me later - this comes from CmdLine/Project/Resources/CLErrors.r -const char *STR12000[100]; +#include "command_line/CmdLine/Project/Resources/CLErrors.r" static int RegisterCmdLineResources() { - return RegisterResource("Command-line strings", 12000, &STR12000); + return RegisterResource("Command-line strings", 12000, STR12000); } -static int special_debug(unsigned char pre, char *) { +static Boolean special_debug(Boolean pre, char *) { if (pre) { SetupDebuggingTraps(); return 1; @@ -118,7 +136,7 @@ static int special_debug(unsigned char pre, char *) { } } -static int special_plugin_debug(unsigned char pre, char *) { +static Boolean special_plugin_debug(Boolean pre, char *) { if (pre) { clState.pluginDebug = 1; return 1; @@ -127,80 +145,82 @@ static int special_plugin_debug(unsigned char pre, char *) { } } -static int special_stdout_base(unsigned char pre, char *) { +static Boolean special_stdout_base(Boolean pre, char *) { if (pre) { return 1; } else { - return clState.stdoutBase != 0; + return clState.stdout_base != 0; } } struct SpecialOption { const char *optname; char **argp; - int (*func)(unsigned char a, char *b); + Boolean (*func)(Boolean a, char *b); }; static struct SpecialOption special_options[3] = { {"", 0, special_debug}, {"--plugin-debug", 0, special_plugin_debug}, - {"--stdout", /*TODO clState*/ 0, special_stdout_base} + {"--stdout", &clState.stdout_base, special_stdout_base} }; -void Main_PreParse(int *pArgc, char ***pArgv) { - struct SpecialOption *so; +void Main_PreParse(int *argc, char ***argv) { int idx; + struct SpecialOption *so; - if (*pArgc > 1) { - restart: - for (idx = 0, so = &special_options[0]; idx < 3; idx++, so++) { - if (!strcmp(so->optname, (*pArgv)[1])) { - if (so->argp) { - *so->argp = (*pArgv)[2]; - so->func(1, *so->argp); - (*pArgv)[1] = (*pArgv)[0]; - (*pArgc)--; - (*pArgv)++; - - (*pArgv)[1] = (*pArgv)[0]; - (*pArgc)--; - (*pArgv)++; - } else { - so->func(1, 0); - (*pArgv)[1] = (*pArgv)[0]; - (*pArgc)--; - (*pArgv)++; + if (*argc > 1) { + do { + idx = 0; + so = special_options; + + do { + if (!strcmp(so->optname, (*argv)[1])) { + if (so->argp) { + *so->argp = (*argv)[2]; + so->func(1, *so->argp); + (*argv)[1] = (*argv)[0]; + (*argc)--; + (*argv)++; + + (*argv)[1] = (*argv)[0]; + (*argc)--; + (*argv)++; + } else { + so->func(1, 0); + (*argv)[1] = (*argv)[0]; + (*argc)--; + (*argv)++; + } + break; } - break; - } - } - - if ((*pArgc) > 1 && idx < 3) - goto restart; + idx++; + so++; + } while (idx < 3); + } while (*argc > 1 && idx < 3); } } -void Main_PassSpecialArgs(void *unk1, void *unk2) { - struct SpecialOption *so; +void Main_PassSpecialArgs(int *argc, char ***argv) { int idx; + struct SpecialOption *so; + + idx = 0; + so = special_options; - for (idx = 0; idx < 3; idx++) { - so = &special_options[idx]; + do { if (so->func(0, 0)) { - AppendArgumentList(unk1, unk2, so->optname); + AppendArgumentList(argc, argv, so->optname); if (so->argp) - AppendArgumentList(unk1, unk2, (*so->argp) ? *so->argp : ""); + AppendArgumentList(argc, argv, (*so->argp) ? *so->argp : ""); } - } + idx++; + so++; + } while (idx < 3); } static int MainInitialized; -void *gProj; -PCmdLine optsCmdLine; -PCmdLineEnvir optsEnvir; -PCmdLineCompiler optsCompiler; -PCmdLineLinker optsLinker; -int Main_Initialize(int argc, const char **argv) { +int Main_Initialize(int argc, char **argv) { static char secret[8]; char exename[256]; @@ -219,7 +239,29 @@ int Main_Initialize(int argc, const char **argv) { Main_PreParse(&argc, &argv); clState.argc = argc; clState.argv = argv; - // TODO more shite + strcpyn(exename, argv[0], strlen(argv[0]), 256); + exename[255] = 0; + + IO_Initialize(); + if (!RegisterCmdLineResources()) + CLFatalError("Could not initialize resource strings"); + + if (!OS_IsFullPath(argv[0])) { + clState.programName = argv[0]; + } else { + clState.programName = OS_GetFileNamePtr(argv[0]); + } + + if (OS_FindProgram(exename, &clState.programSpec)) + CLReportError(2, exename); + + Plugins_Init(); + if (!RegisterStaticCmdLinePlugin()) + CLFatalError("Could not initialize built-in plugins"); + + Proj_Initialize(gProj); + SystemInitResources(&clState.programSpec); + License_Initialize(); MainInitialized = 1; return 0; @@ -236,58 +278,239 @@ int Main_Terminate(int exitcode) { return exitcode; } +enum { + ResultCode_0 = 0, + ResultCode_1 = 1, + ResultCode_2 = 2 +}; + static int Main_ParseCommandLine() { - // TODO: clState, Plugins, gTarg, ... - long vislang; - int x, y; + Plugin *parser; CWCommandLineArgs myargs; + int x, y; + FourCharCode vislang; + + if ( + !Plugins_GetPluginList(0, &numPlugins, &pluginInfo) + || !Plugins_GetPrefPanelUnion(0, &numPanels, &panelNames) + || !(panel_args = xcalloc(0, numPanels * sizeof(CWCommandLineArgs))) + || !(plugin_args = xcalloc(0, numPlugins * sizeof(CWCommandLineArgs))) + ) { + CLFatalError("Out of memory during init\n"); + } + + parser = Plugins_GetParserForPlugin(0, clState.parserstyle, numPlugins, pluginInfo, gTarg->cpu, gTarg->os, numPanels, panelNames); + if (!parser) + CLFatalError("Could not find a command-line parser!"); + + myargs.argc = clState.argc; + myargs.argv = clState.argv; + myargs.envp = 0; + + if (!SendParserRequest(parser, gTarg, &myargs, gTarg->cpu, gTarg->os, numPlugins, pluginInfo, numPanels, panelNames, plugin_args, panel_args, cmdline_build_date, cmdline_build_time, Plugin_GetToolVersionInfo())) { + return CheckForUserBreak() ? ResultCode_2 : ResultCode_1; + } + + if (clState.pluginDebug) { + for (y = 0; y < numPanels; y++) { + CLPrintErr("Outgoing args for '%s': ", panelNames[y]); + for (x = 0; x < panel_args[y].argc; x++) { + CLPrintErr("%s ", panel_args[y].argv[x]); + } + CLPrintErr("\n"); + } + + for (x = 0; x < numPlugins; x++) { + vislang = pluginInfo[x].language ? pluginInfo[x].language : CWFOURCHAR('-','-','-','-'); + CLPrintErr( + "Outgoing args for '%c%c%c%c/%c%c%c%c': ", + (pluginInfo[x].plugintype & 0xFF000000) >> 24, + (pluginInfo[x].plugintype & 0x00FF0000) >> 16, + (pluginInfo[x].plugintype & 0x0000FF00) >> 8, + (pluginInfo[x].plugintype & 0x000000FF), + (vislang & 0xFF000000) >> 24, + (vislang & 0x00FF0000) >> 16, + (vislang & 0x0000FF00) >> 8, + (vislang & 0x000000FF) + ); + for (y = 1; y < plugin_args[x].argc; y++) { + CLPrintErr("%s ", plugin_args[x].argv[y]); + } + CLPrintErr("\n"); + } + } + + return ResultCode_0; } static int Main_SetupParamBlock() { - // TODO: OS, PrefPanes, clState, ... PrefPanelsChangedCallback(0); + + if (optsCompiler.outMakefile[0]) { + int err = OS_MakeFileSpec(optsCompiler.outMakefile, &clState.makefileSpec); + if (err) { + CLReportOSError(8, err, optsCompiler.outMakefile); + return 1; + } + OS_Delete(&clState.makefileSpec); + } + + if (optsCompiler.sbmPath[0]) { + int err = OS_MakePathSpec(0, optsCompiler.sbmPath, &clState.sbmPathSpec); + if (err) { + CLReportOSError(23, err, optsCompiler.sbmPath); + return 1; + } + } else { + OS_GetCWD(&clState.sbmPathSpec); + } + + return 0; } static int Main_ResolveProject() { - // TODO: Various project things + SInt32 startTime; + SInt32 endTime; int err; - long startTime, endTime; + + if (optsCmdLine.state == OptsCmdLineState_0 || optsCmdLine.state == OptsCmdLineState_1) + return 0; + + startTime = LMGetTicks(); + err = CompileFilesInProject(); + if (err) + return err; + + if (optsCmdLine.state == OptsCmdLineState_3) { + err = LinkProject(); + if (err) + return err; + } + + if (!DeleteTemporaries()) + return 1; + + endTime = LMGetTicks(); + + if (optsCmdLine.timeWorking) { + CLReport(24, (endTime - startTime) / 60.0, "resolve", "", "project", ""); + } + + return 0; } -static int UpdatePCmdLineFromVersion(const PCmdLine *given, PCmdLine *target) { - static unsigned char warned; - short version = given->version; +static int UpdatePCmdLineFromVersion(PCmdLine *given, PCmdLine *target) { + static Boolean warned; + SInt16 version = given->version; *target = *given; - // TODO: clState - return 0; + if (clState.pluginDebug && version < 0x1002 && !warned) { + CLReportWarning(104, "CmdLine Panel"); + warned = 1; + } + + if (version == 0x1000) { + target->stderr2stdout = 0; + version++; + } + + if (version == 0x1001) { + target->noCmdLineWarnings = 0; + version++; + } + + if (version < 0x1000 || version > 0x1002) { + CLReportError(104, "CmdLine Panel"); + return 0; + } else { + target->version = 0x1002; + return 1; + } } -static int UpdatePCmdLineEnvirFromVersion(const PCmdLineEnvir *given, PCmdLineEnvir *target) { - static unsigned char warned; - short version = given->version; +static int UpdatePCmdLineEnvirFromVersion(PCmdLineEnvir *given, PCmdLineEnvir *target) { + SInt16 version = given->version; *target = *given; - // TODO: clState - return 0; + if ((clState.pluginDebug && version < 0x1000) || version > 0x1000) { + CLReportError(104, "CmdLine Environment"); + return 0; + } else { + target->version = 0x1000; + return 1; + } } -static int UpdatePCmdLineCompilerFromVersion(const PCmdLineCompiler *given, PCmdLineCompiler *target) { - static unsigned char warned; - short version = given->version; +static int UpdatePCmdLineCompilerFromVersion(PCmdLineCompiler *given, PCmdLineCompiler *target) { + static Boolean warned; + SInt16 version = given->version; *target = *given; - // TODO: clState - return 0; + if (clState.pluginDebug && version < 0x1005 && !warned) { + CLReportWarning(104, "CmdLine Compiler Panel"); + warned = 1; + } + + if (version == 0x1001) { + target->ignoreMissingFiles = 0; + target->printHeaderNames = 0; + version++; + } + + if (version == 0x1002) { + target->sbmState = 0; + target->sbmPath[0] = 0; + version++; + } + + if (version == 0x1003) { + target->canonicalIncludes = 0; + version++; + } + + if (version == 0x1004) { + target->keepObjects = 0; + version++; + } + + if (version <= 0x1000 || version > 0x1005) { + CLReportError(104, "CmdLine Compiler Panel"); + return 0; + } else { + target->version = 0x1005; + return 1; + } } -static int UpdatePCmdLineLinkerFromVersion(const PCmdLineLinker *given, PCmdLineLinker *target) { - static unsigned char warned; - short version = given->version; +static int UpdatePCmdLineLinkerFromVersion(PCmdLineLinker *given, PCmdLineLinker *target) { + static Boolean warned; + SInt16 version = given->version; *target = *given; - // TODO: clState - return 0; + if (clState.pluginDebug && version < 0x1002 && !warned) { + CLReportWarning(104, "CmdLine Linker Panel"); + warned = 1; + } + + if (version == 0x1000) { + target->callPreLinker = 1; + target->callPostLinker = 1; + target->keepLinkerOutput = 1; + version++; + } + + if (version == 0x1001) { + target->callLinker = 1; + version++; + } + + if (version < 0x1000 || version > 0x1002) { + CLReportError(104, "CmdLine Linker Panel"); + return 0; + } else { + target->version = 0x1002; + return 1; + } } static int UpdatePrefPanels(const char *name) { @@ -362,12 +585,49 @@ static int SetupCmdLinePrefPanels() { } static int Main_SetupContext() { - // TODO Target, Plugins, clState + gTarg = Target_New("default", clState.cpu, clState.os, clState.language); + Target_Add(&gProj->targets, gTarg); + + Plugins_AddFileTypeMappingsForTarget(0, 0, gTarg->cpu, gTarg->os); + + gTarg->linker = Plugins_GetLinker(0, gTarg->cpu, gTarg->os); + if (gTarg->linker) { + gTarg->linkerDropinFlags = Plugin_GetDropInFlags(gTarg->linker)->dropinflags; + } else { + if (Plugins_GetLinker(0, CWFOURCHAR('*','*','*','*'), CWFOURCHAR('*','*','*','*'))) + CLFatalError("A linker is compiled in, but does not match the static target!\n"); + gTarg->linkerDropinFlags = 0; + } + + gTarg->preLinker = Plugins_GetPreLinker(0, gTarg->cpu, gTarg->os); + if (gTarg->preLinker) { + gTarg->preLinkerDropinFlags = Plugin_GetDropInFlags(gTarg->preLinker)->dropinflags; + } else { + if (Plugins_GetPreLinker(0, CWFOURCHAR('*','*','*','*'), CWFOURCHAR('*','*','*','*'))) + CLFatalError("A pre-linker is compiled in, but does not match the static target!\n"); + gTarg->preLinkerDropinFlags = 0; + } + + gTarg->postLinker = Plugins_GetPostLinker(0, gTarg->cpu, gTarg->os); + if (gTarg->postLinker) { + gTarg->postLinkerDropinFlags = Plugin_GetDropInFlags(gTarg->postLinker)->dropinflags; + } else { + if (Plugins_GetPostLinker(0, CWFOURCHAR('*','*','*','*'), CWFOURCHAR('*','*','*','*'))) + CLFatalError("A post-linker is compiled in, but does not match the static target!\n"); + gTarg->postLinkerDropinFlags = 0; + } + + if (clState.plugintype == CWDROPINLINKERTYPE) { + if (!gTarg->preLinker && !gTarg->linker && !gTarg->postLinker) + CLFatalError("The linker plugin was not found!"); + } + + gTarg->linkmodel = 0; + Framework_GetEnvInfo(); + return 1; } -jmp_buf exit_program; - int Main_Driver() { volatile int result; @@ -387,4 +647,3 @@ int Main_Driver() { return result; } - diff --git a/command_line/CmdLine/Src/Clients/ClientGlue.c b/command_line/CmdLine/Src/Clients/ClientGlue.c index 9573f51..a1b40b1 100644 --- a/command_line/CmdLine/Src/Clients/ClientGlue.c +++ b/command_line/CmdLine/Src/Clients/ClientGlue.c @@ -1,6 +1,6 @@ #include "mwcc_decomp.h" -int RegisterResource(const char *name, SInt16 rsrcid, Handle list) { +int RegisterResource(const char *name, SInt16 rsrcid, const char **list) { Handle h; if (list == 0) { diff --git a/command_line/CmdLine/Src/Envir/CLIO.c b/command_line/CmdLine/Src/Envir/CLIO.c index ac58506..e832de5 100644 --- a/command_line/CmdLine/Src/Envir/CLIO.c +++ b/command_line/CmdLine/Src/Envir/CLIO.c @@ -149,15 +149,15 @@ void CLPrintType(SInt16 msgtype, ...) { } -void CLPrint(SInt16 msgtype, ...) { +void CLPrint(const char *format, ...) { } -void CLPrintWarning(SInt16 msgtype, ...) { +void CLPrintWarning(const char *format, ...) { } -void CLPrintErr(SInt16 msgtype, ...) { +void CLPrintErr(const char *format, ...) { } diff --git a/command_line/CmdLine/Src/MacEmul/ResourceStrings.c b/command_line/CmdLine/Src/MacEmul/ResourceStrings.c index bdf3735..9f8f333 100644 --- a/command_line/CmdLine/Src/MacEmul/ResourceStrings.c +++ b/command_line/CmdLine/Src/MacEmul/ResourceStrings.c @@ -3,7 +3,7 @@ typedef struct { const char *name; SInt16 rsrcid; - const char **strings; + Handle strings; } Res; static Res rlist[16]; @@ -12,7 +12,7 @@ void Res_Initialize() { memset(rlist, 0, sizeof(rlist)); } -int Res_AddResource(const char *name, SInt16 rsrcid, const char **strings) { +int Res_AddResource(const char *name, SInt16 rsrcid, Handle strings) { int scan; for (scan = 0; scan < 16 && rlist[scan].rsrcid; scan++) { diff --git a/command_line/CmdLine/Src/OSLib/Posix.c b/command_line/CmdLine/Src/OSLib/Posix.c index dc22651..e3f8a03 100644 --- a/command_line/CmdLine/Src/OSLib/Posix.c +++ b/command_line/CmdLine/Src/OSLib/Posix.c @@ -44,7 +44,7 @@ const char *OS_GetErrText(int err) { } } -int OS_InitProgram(int *pArgc, const char ***pArgv) { +int OS_InitProgram(int *pArgc, char ***pArgv) { return 0; } |