Anubis / Anubis

Commit 6ea919b0d9fae788816f7d44749c038a757cad11

Authored by Alain Prouté
1 parent cdde5591

Changed the name 'anubisExecutablesDirectory' into 'compilerStartDirectory', whi… 

…ch corresponds better to the reality.
Showing 1 changed file with 8 additions and 10 deletions   Show diff stats
Inline Side-by-side
anubis_dev/compiler/src/main.cpp
  Show/Hide comments   View file @6ea919b
... ... @@ -380,10 +380,10 @@ static void syntax(void)
380 380  
381 381 This directory is returned by: 'GetProgramRootDir(argv[0])'
382 382 */
383   -String anubisExecutablesDirectory;
  383 +String compilerStartDirectory;
384 384 void set_executables_directory(char *compiler_path)
385 385 {
386   - anubisExecutablesDirectory = GetProgramRootDir(compiler_path);
  386 + compilerStartDirectory = GetProgramRootDir(compiler_path);
387 387 /* Note (see FileIO.cpp): If the directory cannot be found, we have already exited the
388 388 program with an error message. */
389 389 }
... ... @@ -399,7 +399,7 @@ void set_executables_directory(char *compiler_path)
399 399 Linux: (root install) /usr/share/anubis
400 400 Linux: (user install) $HOME/anubis
401 401  
402   - Under WIN32 it is the same as 'anubisExecutablesDirectory'.
  402 + Under WIN32 it is the same as 'compilerStartDirectory'.
403 403  
404 404 Under Linux it is determined depending on where we find the executables.
405 405 */
... ... @@ -407,10 +407,10 @@ String anubisDirectory;
407 407 void set_anubis_directory()
408 408 {
409 409 #ifdef WIN32
410   - anubisDirectory = anubisExecutablesDirectory;
  410 + anubisDirectory = compilerStartDirectory;
411 411 #endif
412 412 #ifdef _LINUX_
413   - if (strncmp(anubisExecutablesDirectory.Cstr(),"/usr",4))
  413 + if (strncmp(compilerStartDirectory.Cstr(),"/usr",4))
414 414 {
415 415 /* user install */
416 416 anubisDirectory = GetUserDir() + "/anubis";
... ... @@ -506,7 +506,7 @@ void populate_my_anubis_directory()
506 506  
507 507 #ifdef WIN32
508 508 /* Copy Crimson Editor file (WIN32 only) */
509   - sourceDir = anubisExecutablesDirectory + "/Crimson Editor";
  509 + sourceDir = compilerStartDirectory + "/Crimson Editor";
510 510 destDir = myAnubisDirectory + "/Crimson Editor";
511 511 NormalizeFileName((char *)sourceDir.Cstr());
512 512 NormalizeFileName((char *)destDir.Cstr());
... ... @@ -627,13 +627,11 @@ int main(int argc, char **argv)
627 627 because they may change the values. */
628 628 if (verbose)
629 629 {
630   - printf("\n Directory of compiler: %s\n", anubisExecutablesDirectory.Cstr());
  630 + printf("\n Compiler started from: %s\n", compilerStartDirectory.Cstr());
631 631 printf(" 'anubis' directory: %s\n", anubisDirectory.Cstr());
632 632 printf(" 'my_anubis' directory: %s\n\n", myAnubisDirectory.Cstr());
633 633 }
634   -
635   -
636   -
  634 +
637 635 /* If the '-index' option present, prepare for making the index. */
638 636 if (gindex)
639 637 {
... ...