Mercurial > octave

comparison src/mkoctfile.in.cc @ 27934:49a0d90cd2a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use Octave coding conventions in src/ directory. * main.in.cc, mkoctfile.in.cc, octave-config.in.cc, octave-svgconvert.cc: Use Octave coding conventions in src/ directory.
author Rik <rik@octave.org>
date Sat, 11 Jan 2020 13:55:55 -0800
parents bd51beb6205e
children 42921bff241a
comparison
equal deleted inserted replaced
27933:863ae57eee69 27934:49a0d90cd2a3
199 199
200 vars["LIBDIR"] 200 vars["LIBDIR"]
201 = get_variable ("LIBDIR", prepend_octave_exec_home (%OCTAVE_CONF_LIBDIR%)); 201 = get_variable ("LIBDIR", prepend_octave_exec_home (%OCTAVE_CONF_LIBDIR%));
202 202
203 vars["OCTLIBDIR"] 203 vars["OCTLIBDIR"]
204 = get_variable ("OCTLIBDIR", prepend_octave_exec_home (%OCTAVE_CONF_OCTLIBDIR%)); 204 = get_variable ("OCTLIBDIR",
205 prepend_octave_exec_home (%OCTAVE_CONF_OCTLIBDIR%));
205 206
206 #if defined (OCTAVE_USE_WINDOWS_API) 207 #if defined (OCTAVE_USE_WINDOWS_API)
207 std::string DEFAULT_INCFLAGS 208 std::string DEFAULT_INCFLAGS
208 = "-I" + quote_path (vars["OCTINCLUDEDIR"] + R"(\..)") 209 = "-I" + quote_path (vars["OCTINCLUDEDIR"] + R"(\..)")
209 + " -I" + quote_path (vars["OCTINCLUDEDIR"]); 210 + " -I" + quote_path (vars["OCTINCLUDEDIR"]);
346 static std::string version_msg = "mkoctfile, version " OCTAVE_VERSION; 347 static std::string version_msg = "mkoctfile, version " OCTAVE_VERSION;
347 348
348 static bool debug = false; 349 static bool debug = false;
349 350
350 static std::string help_msg = 351 static std::string help_msg =
351 "\n" 352 "\n"
352 "Options:\n" 353 "Options:\n"
353 "\n" 354 "\n"
354 " -h, -?, --help Print this message.\n" 355 " -h, -?, --help Print this message.\n"
355 "\n" 356 "\n"
356 " -IDIR Add -IDIR to compile commands.\n" 357 " -IDIR Add -IDIR to compile commands.\n"
357 "\n" 358 "\n"
358 " -idirafter DIR Add -idirafter DIR to compile commands.\n" 359 " -idirafter DIR Add -idirafter DIR to compile commands.\n"
359 "\n" 360 "\n"
360 " -DDEF Add -DDEF to compile commands.\n" 361 " -DDEF Add -DDEF to compile commands.\n"
361 "\n" 362 "\n"
362 " -lLIB Add library LIB to link command.\n" 363 " -lLIB Add library LIB to link command.\n"
363 "\n" 364 "\n"
364 " -LDIR Add -LDIR to link command.\n" 365 " -LDIR Add -LDIR to link command.\n"
365 "\n" 366 "\n"
366 " -M, --depend Generate dependency files (.d) for C and C++\n" 367 " -M, --depend Generate dependency files (.d) for C and C++\n"
367 " source files.\n" 368 " source files.\n"
368 #if ! defined (OCTAVE_USE_WINDOWS_API) 369 #if ! defined (OCTAVE_USE_WINDOWS_API)
369 "\n" 370 "\n"
370 " -pthread Add -pthread to link command.\n" 371 " -pthread Add -pthread to link command.\n"
371 #endif 372 #endif
372 "\n" 373 "\n"
373 " -RDIR Add -RDIR to link command.\n" 374 " -RDIR Add -RDIR to link command.\n"
374 "\n" 375 "\n"
375 " -Wl,... Pass flags though the linker like -Wl,-rpath=...\n" 376 " -Wl,... Pass flags though the linker like -Wl,-rpath=...\n"
376 "\n" 377 "\n"
377 " -W... Pass flags though the compiler like -Wa,OPTION.\n" 378 " -W... Pass flags though the compiler like -Wa,OPTION.\n"
378 "\n" 379 "\n"
379 " -c, --compile Compile, but do not link.\n" 380 " -c, --compile Compile, but do not link.\n"
380 "\n" 381 "\n"
381 " -o FILE, --output FILE Output filename. Default extension is .oct\n" 382 " -o FILE, --output FILE Output filename. Default extension is .oct\n"
382 " (or .mex if --mex is specified) unless linking\n" 383 " (or .mex if --mex is specified) unless linking\n"
383 " a stand-alone executable.\n" 384 " a stand-alone executable.\n"
384 "\n" 385 "\n"
385 " -g Enable debugging options for compilers.\n" 386 " -g Enable debugging options for compilers.\n"
386 "\n" 387 "\n"
387 " -p VAR, --print VAR Print configuration variable VAR. There are\n" 388 " -p VAR, --print VAR Print configuration variable VAR. There are\n"
388 " three categories of variables:\n" 389 " three categories of variables:\n"
389 "\n" 390 "\n"
390 " Octave configuration variables that users may\n" 391 " Octave configuration variables that users may\n"
391 " override with environment variables. These are\n" 392 " override with environment variables. These are\n"
392 " used in commands that mkoctfile executes.\n" 393 " used in commands that mkoctfile executes.\n"
393 "\n" 394 "\n"
394 " ALL_CFLAGS INCLUDEDIR\n" 395 " ALL_CFLAGS INCLUDEDIR\n"
395 " ALL_CXXFLAGS LAPACK_LIBS\n" 396 " ALL_CXXFLAGS LAPACK_LIBS\n"
396 " ALL_FFLAGS LDFLAGS\n" 397 " ALL_FFLAGS LDFLAGS\n"
397 " ALL_LDFLAGS LD_STATIC_FLAG\n" 398 " ALL_LDFLAGS LD_STATIC_FLAG\n"
398 " BLAS_LIBS LIBDIR\n" 399 " BLAS_LIBS LIBDIR\n"
399 " CC LIBOCTAVE\n" 400 " CC LIBOCTAVE\n"
400 " CFLAGS LIBOCTINTERP\n" 401 " CFLAGS LIBOCTINTERP\n"
401 " CPICFLAG OCTAVE_LINK_OPTS\n" 402 " CPICFLAG OCTAVE_LINK_OPTS\n"
402 " CPPFLAGS OCTINCLUDEDIR\n" 403 " CPPFLAGS OCTINCLUDEDIR\n"
403 " CXX OCTAVE_LIBS\n" 404 " CXX OCTAVE_LIBS\n"
404 " CXXFLAGS OCTAVE_LINK_DEPS\n" 405 " CXXFLAGS OCTAVE_LINK_DEPS\n"
405 " CXXLD OCTLIBDIR\n" 406 " CXXLD OCTLIBDIR\n"
406 " CXXPICFLAG OCT_LINK_DEPS\n" 407 " CXXPICFLAG OCT_LINK_DEPS\n"
407 " DL_LDFLAGS OCT_LINK_OPTS\n" 408 " DL_LDFLAGS OCT_LINK_OPTS\n"
408 " F77 RDYNAMIC_FLAG\n" 409 " F77 RDYNAMIC_FLAG\n"
409 " F77_INTEGER8_FLAG SPECIAL_MATH_LIB\n" 410 " F77_INTEGER8_FLAG SPECIAL_MATH_LIB\n"
410 " FFLAGS XTRA_CFLAGS\n" 411 " FFLAGS XTRA_CFLAGS\n"
411 " FPICFLAG XTRA_CXXFLAGS\n" 412 " FPICFLAG XTRA_CXXFLAGS\n"
412 " INCFLAGS\n" 413 " INCFLAGS\n"
413 "\n" 414 "\n"
414 " Octave configuration variables as above, but\n" 415 " Octave configuration variables as above, but\n"
415 " currently unused by mkoctfile.\n" 416 " currently unused by mkoctfile.\n"
416 "\n" 417 "\n"
417 " AR\n" 418 " AR\n"
418 " DEPEND_EXTRA_SED_PATTERN\n" 419 " DEPEND_EXTRA_SED_PATTERN\n"
419 " DEPEND_FLAGS\n" 420 " DEPEND_FLAGS\n"
420 " FFTW3F_LDFLAGS\n" 421 " FFTW3F_LDFLAGS\n"
421 " FFTW3F_LIBS\n" 422 " FFTW3F_LIBS\n"
422 " FFTW3_LDFLAGS\n" 423 " FFTW3_LDFLAGS\n"
423 " FFTW3_LIBS\n" 424 " FFTW3_LIBS\n"
424 " FFTW_LIBS\n" 425 " FFTW_LIBS\n"
425 " FLIBS\n" 426 " FLIBS\n"
426 " LIBS\n" 427 " LIBS\n"
427 " RANLIB\n" 428 " RANLIB\n"
428 " READLINE_LIBS\n" 429 " READLINE_LIBS\n"
429 "\n" 430 "\n"
430 " Octave configuration variables that are provided\n" 431 " Octave configuration variables that are provided\n"
431 " for informational purposes only. Except for\n" 432 " for informational purposes only. Except for\n"
432 " OCTAVE_HOME and OCTAVE_EXEC_HOME, users may not\n" 433 " OCTAVE_HOME and OCTAVE_EXEC_HOME, users may not\n"
433 " override these variables.\n" 434 " override these variables.\n"
434 "\n" 435 "\n"
435 " If OCTAVE_HOME or OCTAVE_EXEC_HOME are set in\n" 436 " If OCTAVE_HOME or OCTAVE_EXEC_HOME are set in\n"
436 " the environment, then other variables are adjusted\n" 437 " the environment, then other variables are adjusted\n"
437 " accordingly with OCTAVE_HOME or OCTAVE_EXEC_HOME\n" 438 " accordingly with OCTAVE_HOME or OCTAVE_EXEC_HOME\n"
438 " substituted for the original value of the directory\n" 439 " substituted for the original value of the directory\n"
439 " specified by the --prefix or --exec-prefix options\n" 440 " specified by the --prefix or --exec-prefix options\n"
440 " that were used when Octave was configured.\n" 441 " that were used when Octave was configured.\n"
441 "\n" 442 "\n"
442 " API_VERSION LOCALFCNFILEDIR\n" 443 " API_VERSION LOCALFCNFILEDIR\n"
443 " ARCHLIBDIR LOCALOCTFILEDIR\n" 444 " ARCHLIBDIR LOCALOCTFILEDIR\n"
444 " BINDIR LOCALSTARTUPFILEDIR\n" 445 " BINDIR LOCALSTARTUPFILEDIR\n"
445 " CANONICAL_HOST_TYPE LOCALVERARCHLIBDIR\n" 446 " CANONICAL_HOST_TYPE LOCALVERARCHLIBDIR\n"
446 " DATADIR LOCALVERFCNFILEDIR\n" 447 " DATADIR LOCALVERFCNFILEDIR\n"
447 " DATAROOTDIR LOCALVEROCTFILEDIR\n" 448 " DATAROOTDIR LOCALVEROCTFILEDIR\n"
448 " DEFAULT_PAGER MAN1DIR\n" 449 " DEFAULT_PAGER MAN1DIR\n"
449 " EXEC_PREFIX MAN1EXT\n" 450 " EXEC_PREFIX MAN1EXT\n"
450 " EXEEXT MANDIR\n" 451 " EXEEXT MANDIR\n"
451 " FCNFILEDIR OCTAVE_EXEC_HOME\n" 452 " FCNFILEDIR OCTAVE_EXEC_HOME\n"
452 " IMAGEDIR OCTAVE_HOME\n" 453 " IMAGEDIR OCTAVE_HOME\n"
453 " INFODIR OCTAVE_VERSION\n" 454 " INFODIR OCTAVE_VERSION\n"
454 " INFOFILE OCTDATADIR\n" 455 " INFOFILE OCTDATADIR\n"
455 " LIBEXECDIR OCTDOCDIR\n" 456 " LIBEXECDIR OCTDOCDIR\n"
456 " LOCALAPIARCHLIBDIR OCTFILEDIR\n" 457 " LOCALAPIARCHLIBDIR OCTFILEDIR\n"
457 " LOCALAPIFCNFILEDIR OCTFONTSDIR\n" 458 " LOCALAPIFCNFILEDIR OCTFONTSDIR\n"
458 " LOCALAPIOCTFILEDIR STARTUPFILEDIR\n" 459 " LOCALAPIOCTFILEDIR STARTUPFILEDIR\n"
459 " LOCALARCHLIBDIR\n" 460 " LOCALARCHLIBDIR\n"
460 "\n" 461 "\n"
461 " --link-stand-alone Link a stand-alone executable file.\n" 462 " --link-stand-alone Link a stand-alone executable file.\n"
462 "\n" 463 "\n"
463 " --mex Assume we are creating a MEX file. Set the\n" 464 " --mex Assume we are creating a MEX file. Set the\n"
464 " default output extension to \".mex\".\n" 465 " default output extension to \".mex\".\n"
465 "\n" 466 "\n"
466 " -s, --strip Strip output file.\n" 467 " -s, --strip Strip output file.\n"
467 "\n" 468 "\n"
468 " -n, --just-print, --dry-run\n" 469 " -n, --just-print, --dry-run\n"
469 " Print commands, but do not execute them.\n" 470 " Print commands, but do not execute them.\n"
470 "\n" 471 "\n"
471 " -v, --verbose Echo commands as they are executed.\n" 472 " -v, --verbose Echo commands as they are executed.\n"
472 "\n" 473 "\n"
473 " FILE Compile or link FILE. Recognized file types are:\n" 474 " FILE Compile or link FILE. Recognized file types are:\n"
474 "\n" 475 "\n"
475 " .c C source\n" 476 " .c C source\n"
476 " .cc C++ source\n" 477 " .cc C++ source\n"
477 " .cp C++ source\n" 478 " .cp C++ source\n"
478 " .cpp C++ source\n" 479 " .cpp C++ source\n"
479 " .CPP C++ source\n" 480 " .CPP C++ source\n"
480 " .cxx C++ source\n" 481 " .cxx C++ source\n"
481 " .c++ C++ source\n" 482 " .c++ C++ source\n"
482 " .C C++ source\n" 483 " .C C++ source\n"
483 " .f Fortran source (fixed form)\n" 484 " .f Fortran source (fixed form)\n"
484 " .F Fortran source (fixed form)\n" 485 " .F Fortran source (fixed form)\n"
485 " .f90 Fortran source (free form)\n" 486 " .f90 Fortran source (free form)\n"
486 " .F90 Fortran source (free form)\n" 487 " .F90 Fortran source (free form)\n"
487 " .o object file\n" 488 " .o object file\n"
488 " .a library file\n" 489 " .a library file\n"
489 #if defined (_MSC_VER) 490 #if defined (_MSC_VER)
490 " .lib library file\n" 491 " .lib library file\n"
491 #endif 492 #endif
492 "\n"; 493 "\n";
493 494
494 static std::string 495 static std::string
495 basename (const std::string& s, bool strip_path = false) 496 basename (const std::string& s, bool strip_path = false)
496 { 497 {
497 std::string retval; 498 std::string retval;
1086 if (link_stand_alone) 1087 if (link_stand_alone)
1087 { 1088 {
1088 if (! vars["CXXLD"].empty ()) 1089 if (! vars["CXXLD"].empty ())
1089 { 1090 {
1090 octave_libs = "-L" + quote_path (vars["OCTLIBDIR"]) 1091 octave_libs = "-L" + quote_path (vars["OCTLIBDIR"])
1091 + ' ' + vars["OCTAVE_LIBS"]; 1092 + ' ' + vars["OCTAVE_LIBS"];
1092 1093
1093 std::string cmd 1094 std::string cmd
1094 = (vars["CXXLD"] + ' ' + vars["CPPFLAGS"] + ' ' 1095 = (vars["CXXLD"] + ' ' + vars["CPPFLAGS"] + ' '
1095 + vars["ALL_CXXFLAGS"] + ' ' + vars["RDYNAMIC_FLAG"] + ' ' 1096 + vars["ALL_CXXFLAGS"] + ' ' + vars["RDYNAMIC_FLAG"] + ' '
1096 + vars["ALL_LDFLAGS"] + ' ' + pass_on_options + ' ' 1097 + vars["ALL_LDFLAGS"] + ' ' + pass_on_options + ' '
1115 } 1116 }
1116 else 1117 else
1117 { 1118 {
1118 #if defined (OCTAVE_USE_WINDOWS_API) || defined(CROSS) 1119 #if defined (OCTAVE_USE_WINDOWS_API) || defined(CROSS)
1119 octave_libs = "-L" + quote_path (vars["OCTLIBDIR"]) 1120 octave_libs = "-L" + quote_path (vars["OCTLIBDIR"])
1120 + ' ' + vars["OCTAVE_LIBS"]; 1121 + ' ' + vars["OCTAVE_LIBS"];
1121 #endif 1122 #endif
1122 1123
1123 std::string cmd 1124 std::string cmd
1124 = (vars["CXXLD"] + ' ' + vars["ALL_CXXFLAGS"] + ' ' 1125 = (vars["CXXLD"] + ' ' + vars["ALL_CXXFLAGS"] + ' '
1125 + vars["DL_LDFLAGS"] + ' ' + vars["LDFLAGS"] + ' ' + pass_on_options 1126 + vars["DL_LDFLAGS"] + ' ' + vars["LDFLAGS"] + ' ' + pass_on_options