octave: src/mkoctfile.in.cc annotate

annotate src/mkoctfile.in.cc @ 29237:1af06a145d40

Un-set API flags when using functions without linking to shared library (patch #8919). * src/main.in.cc, src/mkoctfile.in.cc: The gnulib wrapper functions are linked in statically. Un-define OCTAVE_API to use the correct functions instead of the (mangled) functions from the import library.

author	Markus Mützel <markus.muetzel@gmx.de>
date	Tue, 29 Dec 2020 18:31:46 +0100
parents	f873857f5f86
children	7854d5752dd2

rev	line source
18360 f1ee47866e6b use common code to get OCTAVE_HOME in main, octave-config and mkoctfile John W. Eaton <jwe@octave.org> parents: 18349 diff changeset	1 // %NO_EDIT_WARNING%
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	2
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	3 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // Copyright (C) 2008-2020 The Octave Project Developers
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	25 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	26 ////////////////////////////////////////////////////////////////////////
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	27
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	28 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21202 diff changeset	29 # include "config.h"
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	30 #endif
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	31
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	32 #include <string>
15299 8bd5c490b787 Fix mex compilation with subdirs on Windows platforms (bug #37122) Rik <rik@octave.org> parents: 15271 diff changeset	33 #include <cstring>
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	34 #include <map>
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	35 #include <list>
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	36 #include <algorithm>
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	37 #include <iostream>
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	38 #include <fstream>
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	39 #include <sstream>
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	40 #include <vector>
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	41 #include <cstdlib>
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	42
25504 ace13ff63b90 undo previous change; use 0 instead of O_BINARY John W. Eaton <jwe@octave.org> parents: 25503 diff changeset	43 // Programming note: The CROSS macro here refers to building a
ace13ff63b90 undo previous change; use 0 instead of O_BINARY John W. Eaton <jwe@octave.org> parents: 25503 diff changeset	44 // cross-compiler aware version of mkoctfile that can be used to cross
ace13ff63b90 undo previous change; use 0 instead of O_BINARY John W. Eaton <jwe@octave.org> parents: 25503 diff changeset	45 // compile .oct file for Windows builds of Octave, not that mkoctfile
ace13ff63b90 undo previous change; use 0 instead of O_BINARY John W. Eaton <jwe@octave.org> parents: 25503 diff changeset	46 // itself is being cross compiled.
ace13ff63b90 undo previous change; use 0 instead of O_BINARY John W. Eaton <jwe@octave.org> parents: 25503 diff changeset	47 //
ace13ff63b90 undo previous change; use 0 instead of O_BINARY John W. Eaton <jwe@octave.org> parents: 25503 diff changeset	48 // We don't use the wrapper and gnulib functions when we are building
ace13ff63b90 undo previous change; use 0 instead of O_BINARY John W. Eaton <jwe@octave.org> parents: 25503 diff changeset	49 // with CROSS defined. This configuration is only expected to work on
ace13ff63b90 undo previous change; use 0 instead of O_BINARY John W. Eaton <jwe@octave.org> parents: 25503 diff changeset	50 // modern systems that should not need to have gnulib to fix POSIX
ace13ff63b90 undo previous change; use 0 instead of O_BINARY John W. Eaton <jwe@octave.org> parents: 25503 diff changeset	51 // portability problems. So we just assume a working POSIX system when
ace13ff63b90 undo previous change; use 0 instead of O_BINARY John W. Eaton <jwe@octave.org> parents: 25503 diff changeset	52 // CROSS is defined.
ace13ff63b90 undo previous change; use 0 instead of O_BINARY John W. Eaton <jwe@octave.org> parents: 25503 diff changeset	53
21961 307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	54 #if defined (CROSS)
25503 ec2492a2af6a * mkoctfile.in.cc [CROSS]: Include <fcntl.h> for O_BINARY. John W. Eaton <jwe@octave.org> parents: 25497 diff changeset	55 # include <stdlib.h>
21961 307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	56 # include <sys/types.h>
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	57 # include <sys/wait.h>
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	58 # include <unistd.h>
23801 9d67bd90681b cross tools: define OCTAVE_UNUSED if not defined John D <john.donoghue@ieee.org> parents: 23757 diff changeset	59 # ifndef OCTAVE_UNUSED
9d67bd90681b cross tools: define OCTAVE_UNUSED if not defined John D <john.donoghue@ieee.org> parents: 23757 diff changeset	60 # define OCTAVE_UNUSED
9d67bd90681b cross tools: define OCTAVE_UNUSED if not defined John D <john.donoghue@ieee.org> parents: 23757 diff changeset	61 # endif
21961 307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	62 #else
29237 1af06a145d40 Un-set API flags when using functions without linking to shared library (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 29141 diff changeset	63 // We are linking against static libs so do not decorate with dllimport.
1af06a145d40 Un-set API flags when using functions without linking to shared library (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 29141 diff changeset	64 // FIXME: This should be done by the build system.
1af06a145d40 Un-set API flags when using functions without linking to shared library (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 29141 diff changeset	65 # undef OCTAVE_API
1af06a145d40 Un-set API flags when using functions without linking to shared library (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 29141 diff changeset	66 # define OCTAVE_API
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	67 # include "mkostemps-wrapper.h"
29006 139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	68 # include "uniconv-wrappers.h"
21961 307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	69 # include "unistd-wrappers.h"
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	70 # include "wait-wrappers.h"
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	71 #endif
18916 5999e654f256 WIFEXITED and WEXITSTATUS macros for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 18915 diff changeset	72
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	73 #if ! defined (OCTAVE_VERSION)
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 20955 diff changeset	74 # define OCTAVE_VERSION %OCTAVE_CONF_VERSION%
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	75 #endif
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	76
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	77 #if ! defined (OCTAVE_PREFIX)
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 20955 diff changeset	78 # define OCTAVE_PREFIX %OCTAVE_CONF_PREFIX%
18360 f1ee47866e6b use common code to get OCTAVE_HOME in main, octave-config and mkoctfile John W. Eaton <jwe@octave.org> parents: 18349 diff changeset	79 #endif
f1ee47866e6b use common code to get OCTAVE_HOME in main, octave-config and mkoctfile John W. Eaton <jwe@octave.org> parents: 18349 diff changeset	80
23712 b95c430c0649 revamp insertion of config variables into binaries and eliminate some macros John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	81 #if ! defined (OCTAVE_EXEC_PREFIX)
b95c430c0649 revamp insertion of config variables into binaries and eliminate some macros John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	82 # define OCTAVE_EXEC_PREFIX %OCTAVE_CONF_EXEC_PREFIX%
b95c430c0649 revamp insertion of config variables into binaries and eliminate some macros John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	83 #endif
b95c430c0649 revamp insertion of config variables into binaries and eliminate some macros John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	84
18360 f1ee47866e6b use common code to get OCTAVE_HOME in main, octave-config and mkoctfile John W. Eaton <jwe@octave.org> parents: 18349 diff changeset	85 #include "shared-fcns.h"
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	86
21961 307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	87 #if defined (CROSS)
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	88
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	89 static int
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	90 octave_mkostemps_wrapper (char *tmpl, int suffixlen)
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	91 {
25504 ace13ff63b90 undo previous change; use 0 instead of O_BINARY John W. Eaton <jwe@octave.org> parents: 25503 diff changeset	92 return mkostemps (tmpl, suffixlen, 0);
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	93 }
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	94
29006 139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	95 static char *
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	96 octave_u8_conv_to_encoding (const char tocode, const uint8_t src,
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	97 size_t srclen, size_t *lengthp)
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	98 {
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	99 // FIXME: Do we need to provide the conversion here?
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	100 return nullptr;
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	101 }
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	102
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	103 static int
21961 307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	104 octave_unlink_wrapper (const char *nm)
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	105 {
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	106 return unlink (nm);
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	107 }
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	108
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	109 static bool
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	110 octave_wifexited_wrapper (int status)
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	111 {
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	112 return WIFEXITED (status);
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	113 }
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	114
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	115 static int
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	116 octave_wexitstatus_wrapper (int status)
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	117 {
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	118 return WEXITSTATUS (status);
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	119 }
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	120
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	121 #endif
307a2d7ff29b fix cross build of mkoctfile John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	122
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	123 static std::string
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	124 get_line (FILE *fp)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	125 {
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	126 std::ostringstream buf;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	127
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	128 while (true)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	129 {
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	130 int c = std::fgetc (fp);
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	131
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	132 if (c == '\n' \|\| c == EOF)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	133 break;
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	134
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	135 buf << static_cast<char> (c);
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	136 }
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	137
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	138 return buf.str ();
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	139 }
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	140
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	141 static std::string
25475 245de4f12ca3 link .oct files with liboctave and libinterp on Windows systems (bug #53627) John W. Eaton <jwe@octave.org> parents: 25447 diff changeset	142 get_variable (const char *name, const std::string& defval)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	143 {
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	144 const char *val = getenv (name);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	145
17898 8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17789 diff changeset	146 if (val && *val)
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	147 return std::string (val);
17898 8c33abdd2f9a maint: Avoid using NULL in C++ code. John W. Eaton <jwe@octave.org> parents: 17789 diff changeset	148 else
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	149 return defval;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	150 }
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	151
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	152 static std::string
2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	153 quote_path (const std::string& s)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	154 {
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	155 if (s.find (' ') != std::string::npos && s[0] != '"')
23803 90689bdbe048 Use C++11 raw string literals to avoid escaping double quotes. Rik <rik@octave.org> parents: 23801 diff changeset	156 return '"' + s + '"';
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	157 else
34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	158 return s;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	159 }
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	160
28882 d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	161 static std::string
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	162 replace_prefix (std::string s)
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	163 {
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	164 const std::string match = "${prefix}";
29237 1af06a145d40 Un-set API flags when using functions without linking to shared library (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 29141 diff changeset	165 const std::string repl = prepend_octave_exec_home ("");
28882 d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	166 size_t pos = s.find (match);
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	167 while (pos != std::string::npos )
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	168 {
29237 1af06a145d40 Un-set API flags when using functions without linking to shared library (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 29141 diff changeset	169 s.replace(pos, match.length (), repl);
28882 d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	170 pos = s.find (match);
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	171 }
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	172
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	173 return s;
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	174 }
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	175
28964 091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	176 static std::map<std::string, std::string>
28965 d24e34e179ab mkoctfile: don't add DL_LDFLAGS to LDFLAGS if linking stand alone program John W. Eaton <jwe@octave.org> parents: 28964 diff changeset	177 make_vars_map (bool link_stand_alone, bool verbose, bool debug)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	178 {
23712 b95c430c0649 revamp insertion of config variables into binaries and eliminate some macros John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	179 set_octave_home ();
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	180
28964 091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	181 std::map<std::string, std::string> vars;
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	182
23712 b95c430c0649 revamp insertion of config variables into binaries and eliminate some macros John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	183 vars["OCTAVE_HOME"] = Voctave_home;
b95c430c0649 revamp insertion of config variables into binaries and eliminate some macros John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	184 vars["OCTAVE_EXEC_HOME"] = Voctave_exec_home;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	185
25556 cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	186 vars["API_VERSION"] = %OCTAVE_API_VERSION%;
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	187 vars["CANONICAL_HOST_TYPE"] = %OCTAVE_CANONICAL_HOST_TYPE%;
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	188 vars["DEFAULT_PAGER"] = %OCTAVE_DEFAULT_PAGER%;
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	189 vars["EXEEXT"] = %OCTAVE_EXEEXT%;
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	190 vars["MAN1EXT"] = %OCTAVE_MAN1EXT%;
26472 86bcab2e371e mkoctfile: use OCTAVE_VERSION instead of VERSION for API consistency Mike Miller <mtmiller@octave.org> parents: 26431 diff changeset	191 vars["OCTAVE_VERSION"] = %OCTAVE_VERSION%;
25556 cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	192
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	193 vars["ARCHLIBDIR"] = prepend_octave_exec_home (%OCTAVE_ARCHLIBDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	194 vars["BINDIR"] = prepend_octave_exec_home (%OCTAVE_BINDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	195 vars["DATADIR"] = prepend_octave_home (%OCTAVE_DATADIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	196 vars["DATAROOTDIR"] = prepend_octave_home (%OCTAVE_DATAROOTDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	197 vars["FCNFILEDIR"] = prepend_octave_home (%OCTAVE_FCNFILEDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	198 vars["IMAGEDIR"] = prepend_octave_home (%OCTAVE_IMAGEDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	199 vars["INFODIR"] = prepend_octave_home (%OCTAVE_INFODIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	200 vars["INFOFILE"] = prepend_octave_home (%OCTAVE_INFOFILE%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	201 vars["LIBEXECDIR"] = prepend_octave_exec_home (%OCTAVE_LIBEXECDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	202 vars["LOCALAPIARCHLIBDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALAPIARCHLIBDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	203 vars["LOCALAPIFCNFILEDIR"] = prepend_octave_home (%OCTAVE_LOCALAPIFCNFILEDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	204 vars["LOCALAPIOCTFILEDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALAPIOCTFILEDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	205 vars["LOCALARCHLIBDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALARCHLIBDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	206 vars["LOCALFCNFILEDIR"] = prepend_octave_home (%OCTAVE_LOCALFCNFILEDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	207 vars["LOCALOCTFILEDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALOCTFILEDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	208 vars["LOCALSTARTUPFILEDIR"] = prepend_octave_home (%OCTAVE_LOCALSTARTUPFILEDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	209 vars["LOCALVERARCHLIBDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALVERARCHLIBDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	210 vars["LOCALVERFCNFILEDIR"] = prepend_octave_home (%OCTAVE_LOCALVERFCNFILEDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	211 vars["LOCALVEROCTFILEDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALVEROCTFILEDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	212 vars["MAN1DIR"] = prepend_octave_home (%OCTAVE_MAN1DIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	213 vars["MANDIR"] = prepend_octave_home (%OCTAVE_MANDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	214 vars["OCTDATADIR"] = prepend_octave_home (%OCTAVE_OCTDATADIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	215 vars["OCTDOCDIR"] = prepend_octave_home (%OCTAVE_OCTDOCDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	216 vars["OCTFILEDIR"] = prepend_octave_exec_home (%OCTAVE_OCTFILEDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	217 vars["OCTFONTSDIR"] = prepend_octave_home (%OCTAVE_OCTFONTSDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	218 vars["STARTUPFILEDIR"] = prepend_octave_home (%OCTAVE_STARTUPFILEDIR%);
cbef9fc53fef include all octave-config vars in mkoctfile (bug #54260) John W. Eaton <jwe@octave.org> parents: 25511 diff changeset	219
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	220 vars["OCTINCLUDEDIR"]
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	221 = get_variable ("OCTINCLUDEDIR",
23712 b95c430c0649 revamp insertion of config variables into binaries and eliminate some macros John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	222 prepend_octave_home (%OCTAVE_CONF_OCTINCLUDEDIR%));
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	223
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	224 vars["INCLUDEDIR"]
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	225 = get_variable ("INCLUDEDIR",
23712 b95c430c0649 revamp insertion of config variables into binaries and eliminate some macros John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	226 prepend_octave_home (%OCTAVE_CONF_INCLUDEDIR%));
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	227
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	228 vars["LIBDIR"]
23712 b95c430c0649 revamp insertion of config variables into binaries and eliminate some macros John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	229 = get_variable ("LIBDIR", prepend_octave_exec_home (%OCTAVE_CONF_LIBDIR%));
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	230
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	231 vars["OCTLIBDIR"]
27934 49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	232 = get_variable ("OCTLIBDIR",
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	233 prepend_octave_exec_home (%OCTAVE_CONF_OCTLIBDIR%));
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	234
28831 bf427855cc9a Change mkoctfile to print a usable default LDFLAGS on Windows platforms (bug #59173). Rik <rik@octave.org> parents: 28830 diff changeset	235 std::string DEFAULT_INCFLAGS;
bf427855cc9a Change mkoctfile to print a usable default LDFLAGS on Windows platforms (bug #59173). Rik <rik@octave.org> parents: 28830 diff changeset	236
21979 d04da18a407a use OCTAVE_USE_WINDOWS_API more consistently John W. Eaton <jwe@octave.org> parents: 21961 diff changeset	237 #if defined (OCTAVE_USE_WINDOWS_API)
28831 bf427855cc9a Change mkoctfile to print a usable default LDFLAGS on Windows platforms (bug #59173). Rik <rik@octave.org> parents: 28830 diff changeset	238 DEFAULT_INCFLAGS = "-I" + quote_path (vars["OCTINCLUDEDIR"] + R"(\..)")
bf427855cc9a Change mkoctfile to print a usable default LDFLAGS on Windows platforms (bug #59173). Rik <rik@octave.org> parents: 28830 diff changeset	239 + " -I" + quote_path (vars["OCTINCLUDEDIR"]);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	240 #else
28831 bf427855cc9a Change mkoctfile to print a usable default LDFLAGS on Windows platforms (bug #59173). Rik <rik@octave.org> parents: 28830 diff changeset	241 DEFAULT_INCFLAGS = "-I" + quote_path (vars["OCTINCLUDEDIR"] + "/..")
bf427855cc9a Change mkoctfile to print a usable default LDFLAGS on Windows platforms (bug #59173). Rik <rik@octave.org> parents: 28830 diff changeset	242 + " -I" + quote_path (vars["OCTINCLUDEDIR"]);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	243 #endif
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	244
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	245 if (vars["INCLUDEDIR"] != "/usr/include")
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	246 DEFAULT_INCFLAGS += " -I" + quote_path (vars["INCLUDEDIR"]);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	247
26422 26be3dc2900f Use LDFLAGS for mkoctfile linker flags (bug #48678). Rik <rik@octave.org> parents: 26376 diff changeset	248 std::string DEFAULT_LDFLAGS;
25475 245de4f12ca3 link .oct files with liboctave and libinterp on Windows systems (bug #53627) John W. Eaton <jwe@octave.org> parents: 25447 diff changeset	249
26363 16607f64eea1 Include -loctave -loctinterp and lib path to mkoctfile link command (bug #55033). Ben Abbott <bpabbott@mac.com> parents: 26232 diff changeset	250 #if (defined (OCTAVE_USE_WINDOWS_API) \|\| defined (CROSS)) \|\| (defined __APPLE__ && defined __MACH__)
25475 245de4f12ca3 link .oct files with liboctave and libinterp on Windows systems (bug #53627) John W. Eaton <jwe@octave.org> parents: 25447 diff changeset	251
26431 ff6c90eb6f2d mkoctfile.in.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26422 diff changeset	252 // We'll be linking the files we compile with -loctinterp and -loctave,
ff6c90eb6f2d mkoctfile.in.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26422 diff changeset	253 // so we need to know where to find them.
26422 26be3dc2900f Use LDFLAGS for mkoctfile linker flags (bug #48678). Rik <rik@octave.org> parents: 26376 diff changeset	254 DEFAULT_LDFLAGS += "-L" + quote_path (vars["OCTLIBDIR"]);
25475 245de4f12ca3 link .oct files with liboctave and libinterp on Windows systems (bug #53627) John W. Eaton <jwe@octave.org> parents: 25447 diff changeset	255 #endif
245de4f12ca3 link .oct files with liboctave and libinterp on Windows systems (bug #53627) John W. Eaton <jwe@octave.org> parents: 25447 diff changeset	256
245de4f12ca3 link .oct files with liboctave and libinterp on Windows systems (bug #53627) John W. Eaton <jwe@octave.org> parents: 25447 diff changeset	257 if (vars["LIBDIR"] != "/usr/lib")
26422 26be3dc2900f Use LDFLAGS for mkoctfile linker flags (bug #48678). Rik <rik@octave.org> parents: 26376 diff changeset	258 DEFAULT_LDFLAGS += " -L" + quote_path (vars["LIBDIR"]);
25475 245de4f12ca3 link .oct files with liboctave and libinterp on Windows systems (bug #53627) John W. Eaton <jwe@octave.org> parents: 25447 diff changeset	259
28882 d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	260 vars["CPPFLAGS"] = get_variable ("CPPFLAGS",
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	261 replace_prefix (%OCTAVE_CONF_CPPFLAGS%));
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	262
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	263 vars["INCFLAGS"] = get_variable ("INCFLAGS", DEFAULT_INCFLAGS);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	264
15929 16418ff39a72 strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile John W. Eaton <jwe@octave.org> parents: 15458 diff changeset	265 vars["F77"] = get_variable ("F77", %OCTAVE_CONF_MKOCTFILE_F77%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	266
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	267 vars["FFLAGS"] = get_variable ("FFLAGS", %OCTAVE_CONF_FFLAGS%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	268
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	269 vars["FPICFLAG"] = get_variable ("FPICFLAG", %OCTAVE_CONF_FPICFLAG%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	270
15929 16418ff39a72 strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile John W. Eaton <jwe@octave.org> parents: 15458 diff changeset	271 vars["CC"] = get_variable ("CC", %OCTAVE_CONF_MKOCTFILE_CC%);
28964 091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	272 if (verbose && vars["CC"] == "cc-msvc")
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	273 vars["CC"] += " -d";
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	274
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	275 vars["CFLAGS"] = get_variable ("CFLAGS", %OCTAVE_CONF_CFLAGS%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	276
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	277 vars["CPICFLAG"] = get_variable ("CPICFLAG", %OCTAVE_CONF_CPICFLAG%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	278
15929 16418ff39a72 strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile John W. Eaton <jwe@octave.org> parents: 15458 diff changeset	279 vars["CXX"] = get_variable ("CXX", %OCTAVE_CONF_MKOCTFILE_CXX%);
28964 091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	280 if (verbose && vars["CXX"] == "cc-msvc")
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	281 vars["CXX"] += " -d";
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	282
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	283 vars["CXXFLAGS"] = get_variable ("CXXFLAGS", %OCTAVE_CONF_CXXFLAGS%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	284
27425 633f7a8347c8 Clean up implementation of CXXLD in build scripts (bug #56505). Rik <rik@octave.org> parents: 27277 diff changeset	285 vars["CXXLD"] = get_variable ("CXXLD", vars["CXX"]);
28964 091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	286 if (verbose && vars["CXXLD"] == "cc-msvc")
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	287 vars["CXXLD"] += " -d";
27425 633f7a8347c8 Clean up implementation of CXXLD in build scripts (bug #56505). Rik <rik@octave.org> parents: 27277 diff changeset	288
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	289 vars["CXXPICFLAG"] = get_variable ("CXXPICFLAG", %OCTAVE_CONF_CXXPICFLAG%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	290
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	291 vars["XTRA_CFLAGS"] = get_variable ("XTRA_CFLAGS", %OCTAVE_CONF_XTRA_CFLAGS%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	292
17789 f2b047f9b605 Use GNU style coding conventions for code in src/. Rik <rik@octave.org> parents: 17744 diff changeset	293 vars["XTRA_CXXFLAGS"] = get_variable ("XTRA_CXXFLAGS",
f2b047f9b605 Use GNU style coding conventions for code in src/. Rik <rik@octave.org> parents: 17744 diff changeset	294 %OCTAVE_CONF_XTRA_CXXFLAGS%);
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	295
15944 4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	296 vars["AR"] = get_variable ("AR", %OCTAVE_CONF_MKOCTFILE_AR%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	297
15944 4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	298 vars["RANLIB"] = get_variable ("RANLIB", %OCTAVE_CONF_MKOCTFILE_RANLIB%);
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	299
17789 f2b047f9b605 Use GNU style coding conventions for code in src/. Rik <rik@octave.org> parents: 17744 diff changeset	300 vars["DEPEND_FLAGS"] = get_variable ("DEPEND_FLAGS",
f2b047f9b605 Use GNU style coding conventions for code in src/. Rik <rik@octave.org> parents: 17744 diff changeset	301 %OCTAVE_CONF_DEPEND_FLAGS%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	302
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	303 vars["DEPEND_EXTRA_SED_PATTERN"]
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	304 = get_variable ("DEPEND_EXTRA_SED_PATTERN",
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	305 %OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	306
17789 f2b047f9b605 Use GNU style coding conventions for code in src/. Rik <rik@octave.org> parents: 17744 diff changeset	307 vars["DL_LDFLAGS"] = get_variable ("DL_LDFLAGS",
f2b047f9b605 Use GNU style coding conventions for code in src/. Rik <rik@octave.org> parents: 17744 diff changeset	308 %OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	309
28965 d24e34e179ab mkoctfile: don't add DL_LDFLAGS to LDFLAGS if linking stand alone program John W. Eaton <jwe@octave.org> parents: 28964 diff changeset	310 if (! link_stand_alone)
d24e34e179ab mkoctfile: don't add DL_LDFLAGS to LDFLAGS if linking stand alone program John W. Eaton <jwe@octave.org> parents: 28964 diff changeset	311 DEFAULT_LDFLAGS += ' ' + vars["DL_LDFLAGS"];
28832 6d50f931e810 mkoctfile.in.cc: Add DL_LDFLAGS to DEFAULT_LDFLAGS (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28831 diff changeset	312
17789 f2b047f9b605 Use GNU style coding conventions for code in src/. Rik <rik@octave.org> parents: 17744 diff changeset	313 vars["RDYNAMIC_FLAG"] = get_variable ("RDYNAMIC_FLAG",
f2b047f9b605 Use GNU style coding conventions for code in src/. Rik <rik@octave.org> parents: 17744 diff changeset	314 %OCTAVE_CONF_RDYNAMIC_FLAG%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	315
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	316 vars["LIBOCTAVE"] = "-loctave";
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	317
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	318 vars["LIBOCTINTERP"] = "-loctinterp";
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	319
9515 eee9b3150446 more configure tweaks John W. Eaton <jwe@octave.org> parents: 9303 diff changeset	320 vars["READLINE_LIBS"] = "-lreadline";
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	321
11450 5eb10763069f substitute and use LAPACK_LIBS in mkoctfile script John W. Eaton <jwe@octave.org> parents: 11251 diff changeset	322 vars["LAPACK_LIBS"] = get_variable ("LAPACK_LIBS", %OCTAVE_CONF_LAPACK_LIBS%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	323
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	324 vars["BLAS_LIBS"] = get_variable ("BLAS_LIBS", %OCTAVE_CONF_BLAS_LIBS%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	325
28882 d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	326 vars["FFTW3_LDFLAGS"]
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	327 = get_variable ("FFTW3_LDFLAGS",
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	328 replace_prefix (%OCTAVE_CONF_FFTW3_LDFLAGS%));
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	329
9538 d0239bddf621 use OCTAVE_CHECK_LIB to check for zlib John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	330 vars["FFTW3_LIBS"] = get_variable ("FFTW3_LIBS", %OCTAVE_CONF_FFTW3_LIBS%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	331
28882 d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	332 vars["FFTW3F_LDFLAGS"]
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	333 = get_variable ("FFTW3F_LDFLAGS",
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	334 replace_prefix (%OCTAVE_CONF_FFTW3F_LDFLAGS%));
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	335
9538 d0239bddf621 use OCTAVE_CHECK_LIB to check for zlib John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	336 vars["FFTW3F_LIBS"] = get_variable ("FFTW3F_LIBS", %OCTAVE_CONF_FFTW3F_LIBS%);
22909 7b368d85e86c don't include sundials libraries or options in mkoctfile flags John W. Eaton <jwe@octave.org> parents: 22899 diff changeset	337
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	338 vars["LIBS"] = get_variable ("LIBS", %OCTAVE_CONF_LIBS%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	339
28882 d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	340 vars["FLIBS"] = get_variable ("FLIBS",
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	341 replace_prefix (%OCTAVE_CONF_FLIBS%));
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	342
18349 50505bf88b82 make octave-config and mkoctfile consistent with last shell script versions John W. Eaton <jwe@octave.org> parents: 18342 diff changeset	343 vars["OCTAVE_LINK_DEPS"] = get_variable ("OCTAVE_LINK_DEPS",
23757 bba752b37f8e use different definition for mkoctfile link deps John W. Eaton <jwe@octave.org> parents: 23712 diff changeset	344 %OCTAVE_CONF_MKOCTFILE_OCTAVE_LINK_DEPS%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	345
18349 50505bf88b82 make octave-config and mkoctfile consistent with last shell script versions John W. Eaton <jwe@octave.org> parents: 18342 diff changeset	346 vars["OCTAVE_LINK_OPTS"] = get_variable ("OCTAVE_LINK_OPTS",
50505bf88b82 make octave-config and mkoctfile consistent with last shell script versions John W. Eaton <jwe@octave.org> parents: 18342 diff changeset	347 %OCTAVE_CONF_OCTAVE_LINK_OPTS%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	348
18349 50505bf88b82 make octave-config and mkoctfile consistent with last shell script versions John W. Eaton <jwe@octave.org> parents: 18342 diff changeset	349 vars["OCT_LINK_DEPS"] = get_variable ("OCT_LINK_DEPS",
23757 bba752b37f8e use different definition for mkoctfile link deps John W. Eaton <jwe@octave.org> parents: 23712 diff changeset	350 %OCTAVE_CONF_MKOCTFILE_OCT_LINK_DEPS%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	351
28882 d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	352 vars["OCT_LINK_OPTS"]
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	353 = get_variable ("OCT_LINK_OPTS",
d7169f012ee1 mkoctfile: Account for different prefix on build and host system (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28860 diff changeset	354 replace_prefix (%OCTAVE_CONF_OCT_LINK_OPTS%));
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	355
28831 bf427855cc9a Change mkoctfile to print a usable default LDFLAGS on Windows platforms (bug #59173). Rik <rik@octave.org> parents: 28830 diff changeset	356 vars["LDFLAGS"] = get_variable ("LDFLAGS", DEFAULT_LDFLAGS);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	357
17789 f2b047f9b605 Use GNU style coding conventions for code in src/. Rik <rik@octave.org> parents: 17744 diff changeset	358 vars["LD_STATIC_FLAG"] = get_variable ("LD_STATIC_FLAG",
f2b047f9b605 Use GNU style coding conventions for code in src/. Rik <rik@octave.org> parents: 17744 diff changeset	359 %OCTAVE_CONF_LD_STATIC_FLAG%);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	360
28860 ba6e10c316d3 NEWS: Announce deprecation of LFLAGS (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28833 diff changeset	361 // FIXME: Remove LFLAGS in Octave 8.0
26422 26be3dc2900f Use LDFLAGS for mkoctfile linker flags (bug #48678). Rik <rik@octave.org> parents: 26376 diff changeset	362 vars["LFLAGS"] = get_variable ("LFLAGS", DEFAULT_LDFLAGS);
26612 ab5cc8da283c mkoctfile: restore LDFLAGS, warn only when LFLAGS used directly (bug #55447) Mike Miller <mtmiller@octave.org> parents: 26487 diff changeset	363 if (vars["LFLAGS"] != DEFAULT_LDFLAGS)
28966 b02d9109fb6e mkoctfile: prefix warning messages with program name John W. Eaton <jwe@octave.org> parents: 28965 diff changeset	364 std::cerr << "mkoctfile: warning: LFLAGS is deprecated and will be removed in a future version of Octave, use LDFLAGS instead" << std::endl;
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	365
17789 f2b047f9b605 Use GNU style coding conventions for code in src/. Rik <rik@octave.org> parents: 17744 diff changeset	366 vars["F77_INTEGER8_FLAG"] = get_variable ("F77_INTEGER8_FLAG",
f2b047f9b605 Use GNU style coding conventions for code in src/. Rik <rik@octave.org> parents: 17744 diff changeset	367 %OCTAVE_CONF_F77_INTEGER_8_FLAG%);
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	368 vars["ALL_FFLAGS"] = vars["FFLAGS"] + ' ' + vars["F77_INTEGER8_FLAG"];
28964 091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	369 if (debug)
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	370 vars["ALL_FFLAGS"] += " -g";
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	371
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	372 vars["ALL_CFLAGS"]
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	373 = vars["INCFLAGS"] + ' ' + vars["XTRA_CFLAGS"] + ' ' + vars["CFLAGS"];
28964 091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	374 if (debug)
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	375 vars["ALL_CFLAGS"] += " -g";
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	376
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	377 vars["ALL_CXXFLAGS"]
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	378 = vars["INCFLAGS"] + ' ' + vars["XTRA_CXXFLAGS"] + ' ' + vars["CXXFLAGS"];
28964 091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	379 if (debug)
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	380 vars["ALL_CXXFLAGS"] += " -g";
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	381
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	382 vars["ALL_LDFLAGS"]
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	383 = vars["LD_STATIC_FLAG"] + ' ' + vars["CPICFLAG"] + ' ' + vars["LDFLAGS"];
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	384
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	385 vars["OCTAVE_LIBS"]
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	386 = (vars["LIBOCTINTERP"] + ' ' + vars["LIBOCTAVE"] + ' '
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	387 + vars["SPECIAL_MATH_LIB"]);
9538 d0239bddf621 use OCTAVE_CHECK_LIB to check for zlib John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	388
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	389 vars["FFTW_LIBS"] = vars["FFTW3_LDFLAGS"] + ' ' + vars["FFTW3_LIBS"] + ' '
336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	390 + vars["FFTW3F_LDFLAGS"] + ' ' + vars["FFTW3F_LIBS"];
28964 091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	391
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	392 return vars;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	393 }
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	394
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	395 static std::string usage_msg = "usage: mkoctfile [options] file ...";
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	396
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	397 static std::string version_msg = "mkoctfile, version " OCTAVE_VERSION;
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	398
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	399 static std::string help_msg =
27934 49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	400 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	401 "Options:\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	402 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	403 " -h, -?, --help Print this message.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	404 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	405 " -IDIR Add -IDIR to compile commands.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	406 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	407 " -idirafter DIR Add -idirafter DIR to compile commands.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	408 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	409 " -DDEF Add -DDEF to compile commands.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	410 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	411 " -lLIB Add library LIB to link command.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	412 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	413 " -LDIR Add -LDIR to link command.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	414 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	415 " -M, --depend Generate dependency files (.d) for C and C++\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	416 " source files.\n"
21979 d04da18a407a use OCTAVE_USE_WINDOWS_API more consistently John W. Eaton <jwe@octave.org> parents: 21961 diff changeset	417 #if ! defined (OCTAVE_USE_WINDOWS_API)
27934 49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	418 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	419 " -pthread Add -pthread to link command.\n"
18349 50505bf88b82 make octave-config and mkoctfile consistent with last shell script versions John W. Eaton <jwe@octave.org> parents: 18342 diff changeset	420 #endif
27934 49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	421 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	422 " -RDIR Add -RDIR to link command.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	423 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	424 " -Wl,... Pass flags though the linker like -Wl,-rpath=...\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	425 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	426 " -W... Pass flags though the compiler like -Wa,OPTION.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	427 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	428 " -c, --compile Compile, but do not link.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	429 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	430 " -o FILE, --output FILE Output filename. Default extension is .oct\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	431 " (or .mex if --mex is specified) unless linking\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	432 " a stand-alone executable.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	433 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	434 " -g Enable debugging options for compilers.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	435 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	436 " -p VAR, --print VAR Print configuration variable VAR. There are\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	437 " three categories of variables:\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	438 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	439 " Octave configuration variables that users may\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	440 " override with environment variables. These are\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	441 " used in commands that mkoctfile executes.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	442 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	443 " ALL_CFLAGS INCLUDEDIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	444 " ALL_CXXFLAGS LAPACK_LIBS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	445 " ALL_FFLAGS LDFLAGS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	446 " ALL_LDFLAGS LD_STATIC_FLAG\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	447 " BLAS_LIBS LIBDIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	448 " CC LIBOCTAVE\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	449 " CFLAGS LIBOCTINTERP\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	450 " CPICFLAG OCTAVE_LINK_OPTS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	451 " CPPFLAGS OCTINCLUDEDIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	452 " CXX OCTAVE_LIBS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	453 " CXXFLAGS OCTAVE_LINK_DEPS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	454 " CXXLD OCTLIBDIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	455 " CXXPICFLAG OCT_LINK_DEPS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	456 " DL_LDFLAGS OCT_LINK_OPTS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	457 " F77 RDYNAMIC_FLAG\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	458 " F77_INTEGER8_FLAG SPECIAL_MATH_LIB\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	459 " FFLAGS XTRA_CFLAGS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	460 " FPICFLAG XTRA_CXXFLAGS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	461 " INCFLAGS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	462 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	463 " Octave configuration variables as above, but\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	464 " currently unused by mkoctfile.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	465 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	466 " AR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	467 " DEPEND_EXTRA_SED_PATTERN\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	468 " DEPEND_FLAGS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	469 " FFTW3F_LDFLAGS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	470 " FFTW3F_LIBS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	471 " FFTW3_LDFLAGS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	472 " FFTW3_LIBS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	473 " FFTW_LIBS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	474 " FLIBS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	475 " LIBS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	476 " RANLIB\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	477 " READLINE_LIBS\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	478 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	479 " Octave configuration variables that are provided\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	480 " for informational purposes only. Except for\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	481 " OCTAVE_HOME and OCTAVE_EXEC_HOME, users may not\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	482 " override these variables.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	483 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	484 " If OCTAVE_HOME or OCTAVE_EXEC_HOME are set in\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	485 " the environment, then other variables are adjusted\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	486 " accordingly with OCTAVE_HOME or OCTAVE_EXEC_HOME\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	487 " substituted for the original value of the directory\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	488 " specified by the --prefix or --exec-prefix options\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	489 " that were used when Octave was configured.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	490 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	491 " API_VERSION LOCALFCNFILEDIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	492 " ARCHLIBDIR LOCALOCTFILEDIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	493 " BINDIR LOCALSTARTUPFILEDIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	494 " CANONICAL_HOST_TYPE LOCALVERARCHLIBDIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	495 " DATADIR LOCALVERFCNFILEDIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	496 " DATAROOTDIR LOCALVEROCTFILEDIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	497 " DEFAULT_PAGER MAN1DIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	498 " EXEC_PREFIX MAN1EXT\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	499 " EXEEXT MANDIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	500 " FCNFILEDIR OCTAVE_EXEC_HOME\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	501 " IMAGEDIR OCTAVE_HOME\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	502 " INFODIR OCTAVE_VERSION\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	503 " INFOFILE OCTDATADIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	504 " LIBEXECDIR OCTDOCDIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	505 " LOCALAPIARCHLIBDIR OCTFILEDIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	506 " LOCALAPIFCNFILEDIR OCTFONTSDIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	507 " LOCALAPIOCTFILEDIR STARTUPFILEDIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	508 " LOCALARCHLIBDIR\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	509 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	510 " --link-stand-alone Link a stand-alone executable file.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	511 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	512 " --mex Assume we are creating a MEX file. Set the\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	513 " default output extension to \".mex\".\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	514 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	515 " -s, --strip Strip output file.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	516 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	517 " -n, --just-print, --dry-run\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	518 " Print commands, but do not execute them.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	519 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	520 " -v, --verbose Echo commands as they are executed.\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	521 "\n"
28058 cf59b503db2a * mkoctfile.in.cc (main): Accept --silent option. John W. Eaton <jwe@octave.org> parents: 28048 diff changeset	522 " --silent Ignored. Intended to suppress output from\n"
cf59b503db2a * mkoctfile.in.cc (main): Accept --silent option. John W. Eaton <jwe@octave.org> parents: 28048 diff changeset	523 " compiler steps.\n"
cf59b503db2a * mkoctfile.in.cc (main): Accept --silent option. John W. Eaton <jwe@octave.org> parents: 28048 diff changeset	524 "\n"
27934 49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	525 " FILE Compile or link FILE. Recognized file types are:\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	526 "\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	527 " .c C source\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	528 " .cc C++ source\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	529 " .cp C++ source\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	530 " .cpp C++ source\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	531 " .CPP C++ source\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	532 " .cxx C++ source\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	533 " .c++ C++ source\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	534 " .C C++ source\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	535 " .f Fortran source (fixed form)\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	536 " .F Fortran source (fixed form)\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	537 " .f90 Fortran source (free form)\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	538 " .F90 Fortran source (free form)\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	539 " .o object file\n"
49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	540 " .a library file\n"
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	541 #if defined (_MSC_VER)
27934 49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	542 " .lib library file\n"
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	543 #endif
27934 49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	544 "\n";
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	545
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	546 static std::string
2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	547 basename (const std::string& s, bool strip_path = false)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	548 {
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	549 std::string retval;
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	550
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	551 size_t pos = s.rfind ('.');
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	552
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	553 if (pos == std::string::npos)
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	554 retval = s;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	555 else
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	556 retval = s.substr (0, pos);
15299 8bd5c490b787 Fix mex compilation with subdirs on Windows platforms (bug #37122) Rik <rik@octave.org> parents: 15271 diff changeset	557
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	558 if (strip_path)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	559 {
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	560 size_t p1 = retval.rfind ('/'), p2 = retval.rfind ('\\');
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	561
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	562 pos = (p1 != std::string::npos && p2 != std::string::npos
2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	563 ? std::max (p1, p2) : (p2 != std::string::npos ? p2 : p1));
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	564
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	565 if (pos != std::string::npos)
2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	566 retval = retval.substr (++pos, std::string::npos);
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	567 }
15299 8bd5c490b787 Fix mex compilation with subdirs on Windows platforms (bug #37122) Rik <rik@octave.org> parents: 15271 diff changeset	568
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	569 return retval;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	570 }
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	571
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	572 inline bool
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	573 starts_with (const std::string& s, const std::string& prefix)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	574 {
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	575 return (s.length () >= prefix.length () && s.find (prefix) == 0);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	576 }
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	577
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	578 inline bool
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	579 ends_with (const std::string& s, const std::string& suffix)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	580 {
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	581 return (s.length () >= suffix.length ()
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	582 && s.rfind (suffix) == s.length () - suffix.length ());
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	583 }
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	584
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	585 static int
28963 f29e4791a792 mkoctfile: eliminate global debug variable John W. Eaton <jwe@octave.org> parents: 28883 diff changeset	586 run_command (const std::string& cmd, bool verbose, bool printonly = false)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	587 {
22472 76f2b0436423 Add -n option to print, not execute, mkoctfile commands. Rik <rik@octave.org> parents: 22461 diff changeset	588 if (printonly)
76f2b0436423 Add -n option to print, not execute, mkoctfile commands. Rik <rik@octave.org> parents: 22461 diff changeset	589 {
76f2b0436423 Add -n option to print, not execute, mkoctfile commands. Rik <rik@octave.org> parents: 22461 diff changeset	590 std::cout << cmd << std::endl;
76f2b0436423 Add -n option to print, not execute, mkoctfile commands. Rik <rik@octave.org> parents: 22461 diff changeset	591 return 0;
76f2b0436423 Add -n option to print, not execute, mkoctfile commands. Rik <rik@octave.org> parents: 22461 diff changeset	592 }
76f2b0436423 Add -n option to print, not execute, mkoctfile commands. Rik <rik@octave.org> parents: 22461 diff changeset	593
28963 f29e4791a792 mkoctfile: eliminate global debug variable John W. Eaton <jwe@octave.org> parents: 28883 diff changeset	594 if (verbose)
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	595 std::cout << cmd << std::endl;
18916 5999e654f256 WIFEXITED and WEXITSTATUS macros for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 18915 diff changeset	596
29141 f873857f5f86 system: Support executing commands with non-ASCII characters on Windows (bug #59572). Markus Mützel <markus.muetzel@gmx.de> parents: 29007 diff changeset	597 // FIXME: Call _wsystem on Windows or octave::sys::system.
18916 5999e654f256 WIFEXITED and WEXITSTATUS macros for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 18915 diff changeset	598 int result = system (cmd.c_str ());
5999e654f256 WIFEXITED and WEXITSTATUS macros for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 18915 diff changeset	599
21927 6f62bd248919 use wrapper functions for mkoctfile and main John W. Eaton <jwe@octave.org> parents: 21852 diff changeset	600 if (octave_wifexited_wrapper (result))
6f62bd248919 use wrapper functions for mkoctfile and main John W. Eaton <jwe@octave.org> parents: 21852 diff changeset	601 result = octave_wexitstatus_wrapper (result);
18916 5999e654f256 WIFEXITED and WEXITSTATUS macros for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 18915 diff changeset	602
5999e654f256 WIFEXITED and WEXITSTATUS macros for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 18915 diff changeset	603 return result;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	604 }
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	605
16624 96d02808a881 Support "true" or "yes" for %NO_OCT_FILE_STRIP% in mkoctfile.in.cc. Michael Goffioul <michael.goffioul@gmail.com> parents: 15946 diff changeset	606 bool
96d02808a881 Support "true" or "yes" for %NO_OCT_FILE_STRIP% in mkoctfile.in.cc. Michael Goffioul <michael.goffioul@gmail.com> parents: 15946 diff changeset	607 is_true (const std::string& s)
96d02808a881 Support "true" or "yes" for %NO_OCT_FILE_STRIP% in mkoctfile.in.cc. Michael Goffioul <michael.goffioul@gmail.com> parents: 15946 diff changeset	608 {
18360 f1ee47866e6b use common code to get OCTAVE_HOME in main, octave-config and mkoctfile John W. Eaton <jwe@octave.org> parents: 18349 diff changeset	609 return (s == "yes" \|\| s == "true");
16624 96d02808a881 Support "true" or "yes" for %NO_OCT_FILE_STRIP% in mkoctfile.in.cc. Michael Goffioul <michael.goffioul@gmail.com> parents: 15946 diff changeset	610 }
96d02808a881 Support "true" or "yes" for %NO_OCT_FILE_STRIP% in mkoctfile.in.cc. Michael Goffioul <michael.goffioul@gmail.com> parents: 15946 diff changeset	611
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	612 static std::string
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	613 get_temp_directory (void)
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	614 {
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	615 std::string tempd;
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	616
26853 b0f359a5ad35 mkoctfile: use the TMPDIR environment variable if set (bug #55814) Mike Miller <mtmiller@octave.org> parents: 26612 diff changeset	617 tempd = octave_getenv ("TMPDIR");
b0f359a5ad35 mkoctfile: use the TMPDIR environment variable if set (bug #55814) Mike Miller <mtmiller@octave.org> parents: 26612 diff changeset	618
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	619 #if defined (__MINGW32__) \|\| defined (_MSC_VER)
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	620
26853 b0f359a5ad35 mkoctfile: use the TMPDIR environment variable if set (bug #55814) Mike Miller <mtmiller@octave.org> parents: 26612 diff changeset	621 if (tempd.empty ())
b0f359a5ad35 mkoctfile: use the TMPDIR environment variable if set (bug #55814) Mike Miller <mtmiller@octave.org> parents: 26612 diff changeset	622 tempd = octave_getenv ("TEMP");
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	623
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	624 if (tempd.empty ())
26370 190702f4a075 mkoctfile.in.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26363 diff changeset	625 tempd = octave_getenv ("TMP");
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	626
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	627 #if defined (P_tmpdir)
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	628 if (tempd.empty ())
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	629 tempd = P_tmpdir;
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	630 #endif
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	631
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	632 // Some versions of MinGW and MSVC either don't define P_tmpdir, or
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	633 // define it to a single backslash. In such cases just use C:\temp.
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	634 if (tempd.empty () \|\| tempd == R"(\)")
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	635 tempd = R"(c:\temp)";
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	636
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	637 #else
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	638
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	639 #if defined (P_tmpdir)
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	640 if (tempd.empty ())
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	641 tempd = P_tmpdir;
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	642 #else
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	643 if (tempd.empty ())
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	644 tempd = "/tmp";
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	645 #endif
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	646
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	647 #endif
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	648
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	649 return tempd;
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	650 }
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	651
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	652 static std::string
28124 5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	653 create_interleaved_complex_file (void)
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	654 {
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	655 std::string tmpl = get_temp_directory () + "/oct-XXXXXX.c";
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	656
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	657 char *ctmpl = new char [tmpl.length () + 1];
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	658
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	659 ctmpl = strcpy (ctmpl, tmpl.c_str ());
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	660
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	661 // mkostemps will open the file and return a file descriptor. We
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	662 // won't worry about closing it because we will need the file until we
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	663 // are done and then the file will be closed when mkoctfile exits.
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	664 int fd = octave_mkostemps_wrapper (ctmpl, 2);
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	665
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	666 // Make C++ string from filled-in template.
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	667 std::string retval (ctmpl);
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	668 delete [] ctmpl;
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	669
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	670 // Write symbol definition to file.
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	671 FILE *fid = fdopen (fd, "w");
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	672 fputs ("const int __mx_has_interleaved_complex__ = 1;\n", fid);
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	673 fclose (fid);
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	674
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	675 return retval;
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	676 }
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	677
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	678 static std::string
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	679 tmp_objfile_name (void)
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	680 {
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	681 std::string tmpl = get_temp_directory () + "/oct-XXXXXX.o";
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	682
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	683 char *ctmpl = new char [tmpl.length () + 1];
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	684
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	685 ctmpl = strcpy (ctmpl, tmpl.c_str ());
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	686
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	687 // mkostemps will open the file and return a file descriptor. We
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	688 // won't worry about closing it because we will need the file until we
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	689 // are done and then the file will be closed when mkoctfile exits.
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	690 octave_mkostemps_wrapper (ctmpl, 2);
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	691
26487 6aa84dc27d01 Fix memory leak in mkoctfile. Rik <rik@octave.org> parents: 26472 diff changeset	692 std::string retval (ctmpl); // make C++ string from filled-in template
6aa84dc27d01 Fix memory leak in mkoctfile. Rik <rik@octave.org> parents: 26472 diff changeset	693 delete [] ctmpl;
6aa84dc27d01 Fix memory leak in mkoctfile. Rik <rik@octave.org> parents: 26472 diff changeset	694
6aa84dc27d01 Fix memory leak in mkoctfile. Rik <rik@octave.org> parents: 26472 diff changeset	695 return retval;
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	696 }
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	697
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	698 static void
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	699 clean_up_tmp_files (const std::list<std::string>& tmp_files)
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	700 {
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	701 for (const auto& file : tmp_files)
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	702 octave_unlink_wrapper (file.c_str ());
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	703 }
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	704
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	705 int
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	706 main (int argc, char **argv)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	707 {
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	708 if (argc == 1)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	709 {
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	710 std::cout << usage_msg << std::endl;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	711 return 1;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	712 }
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	713
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20713 diff changeset	714 if (argc == 2 && (! strcmp (argv[1], "-v")
77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20713 diff changeset	715 \|\| ! strcmp (argv[1], "-version")
77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20713 diff changeset	716 \|\| ! strcmp (argv[1], "--version")))
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	717 {
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	718 std::cout << version_msg << std::endl;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	719 return 0;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	720 }
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	721
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	722 std::list<std::string> cfiles, ccfiles, f77files, tmp_objfiles;
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	723 std::string output_ext = ".oct";
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	724 std::string objfiles, libfiles, octfile, outputfile;
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	725 std::string incflags, defs, ldflags, pass_on_options;
28964 091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	726 std::string var_to_print;
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	727 bool debug = false;
28963 f29e4791a792 mkoctfile: eliminate global debug variable John W. Eaton <jwe@octave.org> parents: 28883 diff changeset	728 bool verbose = false;
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	729 bool strip = false;
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	730 bool no_oct_file_strip_on_this_platform = is_true ("%NO_OCT_FILE_STRIP%");
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	731 bool compile_only = false;
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	732 bool link_stand_alone = false;
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	733 bool depend = false;
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	734 bool printonly = false;
25507 b61f3500651f mkoctfile: fix check for using -o and -c with multiple source files (bug #54182) John W. Eaton <jwe@octave.org> parents: 25504 diff changeset	735 bool output_file_option = false;
28124 5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	736 bool creating_mex_file = false;
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	737 bool r2017b_option = false;
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	738 bool r2018a_option = false;
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	739 // The default for this may change in the future.
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	740 bool mx_has_interleaved_complex = false;
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	741
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	742 for (int i = 1; i < argc; i++)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	743 {
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	744 std::string arg = argv[i];
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	745
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	746 std::string file;
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	747
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	748 if (ends_with (arg, ".c"))
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	749 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	750 file = arg;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	751 cfiles.push_back (file);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	752 }
22031 2cfbb6b25428 mkoctfile: support more file extensions for C++ sources (bug #48381) Mike Miller <mtmiller@octave.org> parents: 22022 diff changeset	753 else if (ends_with (arg, ".cc") \|\| ends_with (arg, ".cp")
2cfbb6b25428 mkoctfile: support more file extensions for C++ sources (bug #48381) Mike Miller <mtmiller@octave.org> parents: 22022 diff changeset	754 \|\| ends_with (arg, ".cpp") \|\| ends_with (arg, ".CPP")
2cfbb6b25428 mkoctfile: support more file extensions for C++ sources (bug #48381) Mike Miller <mtmiller@octave.org> parents: 22022 diff changeset	755 \|\| ends_with (arg, ".cxx") \|\| ends_with (arg, ".c++")
2cfbb6b25428 mkoctfile: support more file extensions for C++ sources (bug #48381) Mike Miller <mtmiller@octave.org> parents: 22022 diff changeset	756 \|\| ends_with (arg, ".C"))
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	757 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	758 file = arg;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	759 ccfiles.push_back (file);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	760 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	761 else if (ends_with (arg, ".f") \|\| ends_with (arg, ".F")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	762 \|\| ends_with (arg, "f90") \|\| ends_with (arg, ".F90"))
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	763 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	764 file = arg;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	765 f77files.push_back (file);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	766 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	767 else if (ends_with (arg, ".o") \|\| ends_with (arg, ".obj"))
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	768 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	769 file = arg;
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	770 objfiles += (' ' + quote_path (arg));
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	771 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	772 else if (ends_with (arg, ".lib") \|\| ends_with (arg, ".a"))
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	773 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	774 file = arg;
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	775 libfiles += (' ' + quote_path (arg));
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	776 }
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	777 else if (arg == "-d" \|\| arg == "-debug" \|\| arg == "--debug"
33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	778 \|\| arg == "-v" \|\| arg == "-verbose" \|\| arg == "--verbose")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	779 {
28963 f29e4791a792 mkoctfile: eliminate global debug variable John W. Eaton <jwe@octave.org> parents: 28883 diff changeset	780 verbose = true;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	781 }
28058 cf59b503db2a * mkoctfile.in.cc (main): Accept --silent option. John W. Eaton <jwe@octave.org> parents: 28048 diff changeset	782 else if (arg == "-silent" \|\| arg == "--silent")
cf59b503db2a * mkoctfile.in.cc (main): Accept --silent option. John W. Eaton <jwe@octave.org> parents: 28048 diff changeset	783 {
cf59b503db2a * mkoctfile.in.cc (main): Accept --silent option. John W. Eaton <jwe@octave.org> parents: 28048 diff changeset	784 // Ignored for now.
cf59b503db2a * mkoctfile.in.cc (main): Accept --silent option. John W. Eaton <jwe@octave.org> parents: 28048 diff changeset	785 }
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	786 else if (arg == "-h" \|\| arg == "-?" \|\| arg == "-help" \|\| arg == "--help")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	787 {
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	788 std::cout << usage_msg << std::endl;
2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	789 std::cout << help_msg << std::endl;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	790 return 0;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	791 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	792 else if (starts_with (arg, "-I"))
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	793 {
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	794 incflags += (' ' + quote_path (arg));
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	795 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	796 else if (arg == "-idirafter")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	797 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	798 if (i < argc-1)
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	799 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	800 arg = argv[++i];
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	801 incflags += (" -idirafter " + arg);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	802 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	803 else
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	804 std::cerr << "mkoctfile: include directory name missing"
2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	805 << std::endl;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	806 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	807 else if (starts_with (arg, "-D"))
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	808 {
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	809 defs += (' ' + arg);
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	810 }
22461 cc4f31e8477f Accept, but ignore, mex argument -largeArrayDims, -compatibleArrayDims (bug #39984). Rik <rik@octave.org> parents: 22459 diff changeset	811 else if (arg == "-largeArrayDims" \|\| arg == "-compatibleArrayDims")
cc4f31e8477f Accept, but ignore, mex argument -largeArrayDims, -compatibleArrayDims (bug #39984). Rik <rik@octave.org> parents: 22459 diff changeset	812 {
28966 b02d9109fb6e mkoctfile: prefix warning messages with program name John W. Eaton <jwe@octave.org> parents: 28965 diff changeset	813 std::cerr << "mkoctfile: warning: -largeArrayDims and -compatibleArrayDims are accepted for compatibility, but ignored" << std::endl;
22461 cc4f31e8477f Accept, but ignore, mex argument -largeArrayDims, -compatibleArrayDims (bug #39984). Rik <rik@octave.org> parents: 22459 diff changeset	814 }
28124 5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	815 else if (arg == "-R2017b")
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	816 {
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	817 if (r2018a_option)
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	818 {
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	819 std::cerr << "mkoctfile: only one of -R2017b and -R2018a may be used" << std::endl;
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	820 return 1;
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	821 }
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	822
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	823 r2017b_option = true;
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	824 }
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	825 else if (arg == "-R2018a")
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	826 {
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	827 if (r2017b_option)
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	828 {
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	829 std::cerr << "mkoctfile: only one of -R2017b and -R2018a may be used" << std::endl;
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	830 return 1;
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	831 }
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	832
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	833 r2018a_option = true;
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	834 mx_has_interleaved_complex = true;
22461 cc4f31e8477f Accept, but ignore, mex argument -largeArrayDims, -compatibleArrayDims (bug #39984). Rik <rik@octave.org> parents: 22459 diff changeset	835 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	836 else if (starts_with (arg, "-Wl,") \|\| starts_with (arg, "-l")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	837 \|\| starts_with (arg, "-L") \|\| starts_with (arg, "-R"))
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	838 {
28129 16ccaebe250a mkoctfile: quote linker arguments that may contain spaces (bug #57878) Mike Miller <mtmiller@octave.org> parents: 28058 diff changeset	839 ldflags += (' ' + quote_path (arg));
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	840 }
21979 d04da18a407a use OCTAVE_USE_WINDOWS_API more consistently John W. Eaton <jwe@octave.org> parents: 21961 diff changeset	841 #if ! defined (OCTAVE_USE_WINDOWS_API)
18349 50505bf88b82 make octave-config and mkoctfile consistent with last shell script versions John W. Eaton <jwe@octave.org> parents: 18342 diff changeset	842 else if (arg == "-pthread")
50505bf88b82 make octave-config and mkoctfile consistent with last shell script versions John W. Eaton <jwe@octave.org> parents: 18342 diff changeset	843 {
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	844 ldflags += (' ' + arg);
18349 50505bf88b82 make octave-config and mkoctfile consistent with last shell script versions John W. Eaton <jwe@octave.org> parents: 18342 diff changeset	845 }
50505bf88b82 make octave-config and mkoctfile consistent with last shell script versions John W. Eaton <jwe@octave.org> parents: 18342 diff changeset	846 #endif
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	847 else if (arg == "-M" \|\| arg == "-depend" \|\| arg == "--depend")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	848 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	849 depend = true;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	850 }
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	851 else if (arg == "-o" \|\| arg == "-output" \|\| arg == "--output")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	852 {
25507 b61f3500651f mkoctfile: fix check for using -o and -c with multiple source files (bug #54182) John W. Eaton <jwe@octave.org> parents: 25504 diff changeset	853 output_file_option = true;
b61f3500651f mkoctfile: fix check for using -o and -c with multiple source files (bug #54182) John W. Eaton <jwe@octave.org> parents: 25504 diff changeset	854
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	855 if (i < argc-1)
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	856 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	857 arg = argv[++i];
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	858 outputfile = arg;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	859 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	860 else
20713 2469d78a1d8b Consistently use 'filename' rather than 'file name' throughout code base. Rik <rik@octave.org> parents: 20507 diff changeset	861 std::cerr << "mkoctfile: output filename missing" << std::endl;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	862 }
22481 541a20a4961c mkoctfile: alias --dry-run option to --just-print because it's very common. Carnë Draug <carandraug@octave.org> parents: 22472 diff changeset	863 else if (arg == "-n" \|\| arg == "--dry-run" \|\| arg == "--just-print")
22472 76f2b0436423 Add -n option to print, not execute, mkoctfile commands. Rik <rik@octave.org> parents: 22461 diff changeset	864 {
76f2b0436423 Add -n option to print, not execute, mkoctfile commands. Rik <rik@octave.org> parents: 22461 diff changeset	865 printonly = true;
76f2b0436423 Add -n option to print, not execute, mkoctfile commands. Rik <rik@octave.org> parents: 22461 diff changeset	866 }
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	867 else if (arg == "-p" \|\| arg == "-print" \|\| arg == "--print")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	868 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	869 if (i < argc-1)
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	870 {
28964 091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	871 ++i;
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	872
26422 26be3dc2900f Use LDFLAGS for mkoctfile linker flags (bug #48678). Rik <rik@octave.org> parents: 26376 diff changeset	873 // FIXME: Remove LFLAGS checking in Octave 7.0
28964 091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	874 if (! strcmp (argv[i], "LFLAGS"))
28966 b02d9109fb6e mkoctfile: prefix warning messages with program name John W. Eaton <jwe@octave.org> parents: 28965 diff changeset	875 std::cerr << "mkoctfile: warning: LFLAGS is deprecated and will be removed in a future version of Octave, use LDFLAGS instead" << std::endl;
26422 26be3dc2900f Use LDFLAGS for mkoctfile linker flags (bug #48678). Rik <rik@octave.org> parents: 26376 diff changeset	876
28964 091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	877 if (! var_to_print.empty ())
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	878 std::cerr << "mkoctfile: warning: only one '" << arg
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	879 << "' option will be processed" << std::endl;
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	880 else
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	881 var_to_print = argv[i];
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	882 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	883 else
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	884 std::cerr << "mkoctfile: --print requires argument" << std::endl;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	885 }
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	886 else if (arg == "-s" \|\| arg == "-strip" \|\| arg == "--strip")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	887 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	888 if (no_oct_file_strip_on_this_platform)
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	889 std::cerr << "mkoctfile: stripping disabled on this platform"
2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	890 << std::endl;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	891 else
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	892 strip = true;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	893 }
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	894 else if (arg == "-c" \|\| arg == "-compile" \|\| arg == "--compile")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	895 {
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	896 compile_only = true;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	897 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	898 else if (arg == "-g")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	899 {
28964 091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	900 debug = true;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	901 }
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	902 else if (arg == "-link-stand-alone" \|\| arg == "--link-stand-alone")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	903 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	904 link_stand_alone = true;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	905 }
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	906 else if (arg == "-mex" \|\| arg == "--mex")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	907 {
28124 5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	908 creating_mex_file = true;
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	909
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	910 incflags += " -I.";
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	911 #if defined (_MSC_VER)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	912 ldflags += " -Wl,-export:mexFunction";
9303 adf676387922 properly #ifdef MSVC linker specific flags Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 9245 diff changeset	913 #endif
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	914 output_ext = ".mex";
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	915 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	916 else if (starts_with (arg, "-W"))
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	917 {
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	918 pass_on_options += (' ' + arg);
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	919 }
24742 9db2f757c7c0 Accept -O as an argument to mkoctfile (bug #53099). Rik <rik@octave.org> parents: 24634 diff changeset	920 else if (starts_with (arg, "-O"))
9db2f757c7c0 Accept -O as an argument to mkoctfile (bug #53099). Rik <rik@octave.org> parents: 24634 diff changeset	921 {
9db2f757c7c0 Accept -O as an argument to mkoctfile (bug #53099). Rik <rik@octave.org> parents: 24634 diff changeset	922 pass_on_options += (' ' + arg);
9db2f757c7c0 Accept -O as an argument to mkoctfile (bug #53099). Rik <rik@octave.org> parents: 24634 diff changeset	923 }
19711 b59aabc08e63 Pass unrecognized '-' arguments through mkoctfile to compiler (bug #34169). Rik <rik@octave.org> parents: 19697 diff changeset	924 else if (starts_with (arg, "-"))
b59aabc08e63 Pass unrecognized '-' arguments through mkoctfile to compiler (bug #34169). Rik <rik@octave.org> parents: 19697 diff changeset	925 {
24634 ab2321d4ba03 maint: strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 24622 diff changeset	926 // Pass through any unrecognized options.
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	927 pass_on_options += (' ' + arg);
24634 ab2321d4ba03 maint: strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 24622 diff changeset	928 // Check for an additional argument following the option.
24742 9db2f757c7c0 Accept -O as an argument to mkoctfile (bug #53099). Rik <rik@octave.org> parents: 24634 diff changeset	929 // However, don't check the final position which is typically a file
9db2f757c7c0 Accept -O as an argument to mkoctfile (bug #53099). Rik <rik@octave.org> parents: 24634 diff changeset	930 if (i < argc-2)
24622 298c6a6bd869 Accept compound unrecognized arguments to mkoctfile (bug #52928). Rik <rik@octave.org> parents: 24534 diff changeset	931 {
298c6a6bd869 Accept compound unrecognized arguments to mkoctfile (bug #52928). Rik <rik@octave.org> parents: 24534 diff changeset	932 arg = argv[i+1];
298c6a6bd869 Accept compound unrecognized arguments to mkoctfile (bug #52928). Rik <rik@octave.org> parents: 24534 diff changeset	933 if (arg[0] != '-')
298c6a6bd869 Accept compound unrecognized arguments to mkoctfile (bug #52928). Rik <rik@octave.org> parents: 24534 diff changeset	934 {
298c6a6bd869 Accept compound unrecognized arguments to mkoctfile (bug #52928). Rik <rik@octave.org> parents: 24534 diff changeset	935 pass_on_options += (' ' + arg);
298c6a6bd869 Accept compound unrecognized arguments to mkoctfile (bug #52928). Rik <rik@octave.org> parents: 24534 diff changeset	936 i++;
298c6a6bd869 Accept compound unrecognized arguments to mkoctfile (bug #52928). Rik <rik@octave.org> parents: 24534 diff changeset	937 }
298c6a6bd869 Accept compound unrecognized arguments to mkoctfile (bug #52928). Rik <rik@octave.org> parents: 24534 diff changeset	938 }
19711 b59aabc08e63 Pass unrecognized '-' arguments through mkoctfile to compiler (bug #34169). Rik <rik@octave.org> parents: 19697 diff changeset	939 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	940 else
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	941 {
18796 dd57ca9ef7e4 Add missing newline to error message from mkoctfile. Rik <rik@octave.org> parents: 18364 diff changeset	942 std::cerr << "mkoctfile: unrecognized argument " << arg << std::endl;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	943 return 1;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	944 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	945
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20713 diff changeset	946 if (! file.empty () && octfile.empty ())
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	947 octfile = file;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	948 }
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	949
28965 d24e34e179ab mkoctfile: don't add DL_LDFLAGS to LDFLAGS if linking stand alone program John W. Eaton <jwe@octave.org> parents: 28964 diff changeset	950 std::map<std::string, std::string> vars
d24e34e179ab mkoctfile: don't add DL_LDFLAGS to LDFLAGS if linking stand alone program John W. Eaton <jwe@octave.org> parents: 28964 diff changeset	951 = make_vars_map (link_stand_alone, verbose, debug);
28964 091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	952
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	953 if (! var_to_print.empty ())
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	954 {
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	955 if (vars.find (var_to_print) == vars.end ())
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	956 {
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	957 std::cerr << "mkoctfile: unknown variable '" << var_to_print << "'"
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	958 << std::endl;
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	959 return 1;
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	960 }
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	961
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	962 std::cout << vars[var_to_print] << std::endl;
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	963
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	964 return 0;
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	965 }
091aeae73b60 mkoctfile: revamp argument parsing John W. Eaton <jwe@octave.org> parents: 28963 diff changeset	966
28124 5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	967 if (creating_mex_file)
22459 6af82fc041a4 Implement Matlab-compatible MEX functions mxAssert and mxAssertS. Rik <rik@octave.org> parents: 22412 diff changeset	968 {
28124 5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	969 if (vars["ALL_CFLAGS"].find ("-g") != std::string::npos)
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	970 defs += " -DMEX_DEBUG";
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	971
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	972 if (mx_has_interleaved_complex)
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	973 {
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	974 defs += " -DMX_HAS_INTERLEAVED_COMPLEX=1";
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	975
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	976 if (! compile_only)
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	977 {
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	978 // Create tmp C source file that defines an extern symbol
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	979 // that can be checked when loading the mex file to
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	980 // determine that the file was compiled expecting
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	981 // interleaved complex values.
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	982
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	983 std::string tmp_file = create_interleaved_complex_file ();
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	984
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	985 cfiles.push_back (tmp_file);
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	986 }
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	987 }
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	988 }
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	989 else
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	990 {
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	991 if (r2017b_option)
28966 b02d9109fb6e mkoctfile: prefix warning messages with program name John W. Eaton <jwe@octave.org> parents: 28965 diff changeset	992 std::cerr << "mkoctfile: warning: -R2017b option ignored unless creating mex file"
28124 5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	993 << std::endl;
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	994
5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	995 if (r2018a_option)
28966 b02d9109fb6e mkoctfile: prefix warning messages with program name John W. Eaton <jwe@octave.org> parents: 28965 diff changeset	996 std::cerr << "mkoctfile: warning: -R2018a option ignored unless creating mex file"
28124 5b37e5e03bb5 mkoctfile.cc: accept -R2017b and -R2018a mex options John W. Eaton <jwe@octave.org> parents: 28058 diff changeset	997 << std::endl;
22459 6af82fc041a4 Implement Matlab-compatible MEX functions mxAssert and mxAssertS. Rik <rik@octave.org> parents: 22412 diff changeset	998 }
6af82fc041a4 Implement Matlab-compatible MEX functions mxAssert and mxAssertS. Rik <rik@octave.org> parents: 22412 diff changeset	999
25507 b61f3500651f mkoctfile: fix check for using -o and -c with multiple source files (bug #54182) John W. Eaton <jwe@octave.org> parents: 25504 diff changeset	1000 if (compile_only && output_file_option
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1001 && (cfiles.size () + ccfiles.size () + f77files.size ()) > 1)
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1002 {
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1003 std::cerr << "mkoctfile: may not use -c and -o with multiple source files"
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1004 << std::endl;
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1005 return 1;
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1006 }
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1007
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1008 std::string output_option;
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1009
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1010 if (link_stand_alone)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1011 {
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20713 diff changeset	1012 if (! outputfile.empty ())
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1013 output_option = "-o " + outputfile;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1014 }
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1015 else
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1016 {
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20713 diff changeset	1017 if (! outputfile.empty ())
9957 59ed11557715 mkoctfile: if output file is specified and it does not end in output_ext, append output_ext John W. Eaton <jwe@octave.org> parents: 9956 diff changeset	1018 {
25495 92a64cb5e475 mkoctfile: Prevent invalid string indexing crash. John W. Eaton <jwe@octave.org> parents: 25494 diff changeset	1019 // FIXME: should probably do a better job of finding the
92a64cb5e475 mkoctfile: Prevent invalid string indexing crash. John W. Eaton <jwe@octave.org> parents: 25494 diff changeset	1020 // filename extension instead of just looking at the filename
92a64cb5e475 mkoctfile: Prevent invalid string indexing crash. John W. Eaton <jwe@octave.org> parents: 25494 diff changeset	1021 // length.
92a64cb5e475 mkoctfile: Prevent invalid string indexing crash. John W. Eaton <jwe@octave.org> parents: 25494 diff changeset	1022
9957 59ed11557715 mkoctfile: if output file is specified and it does not end in output_ext, append output_ext John W. Eaton <jwe@octave.org> parents: 9956 diff changeset	1023 octfile = outputfile;
59ed11557715 mkoctfile: if output file is specified and it does not end in output_ext, append output_ext John W. Eaton <jwe@octave.org> parents: 9956 diff changeset	1024 size_t len = octfile.length ();
59ed11557715 mkoctfile: if output file is specified and it does not end in output_ext, append output_ext John W. Eaton <jwe@octave.org> parents: 9956 diff changeset	1025 size_t len_ext = output_ext.length ();
25495 92a64cb5e475 mkoctfile: Prevent invalid string indexing crash. John W. Eaton <jwe@octave.org> parents: 25494 diff changeset	1026 if (len <= len_ext \|\| octfile.substr (len-len_ext) != output_ext)
9957 59ed11557715 mkoctfile: if output file is specified and it does not end in output_ext, append output_ext John W. Eaton <jwe@octave.org> parents: 9956 diff changeset	1027 octfile += output_ext;
59ed11557715 mkoctfile: if output file is specified and it does not end in output_ext, append output_ext John W. Eaton <jwe@octave.org> parents: 9956 diff changeset	1028 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1029 else
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1030 octfile = basename (octfile, true) + output_ext;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1031 }
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1032
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1033 if (depend)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1034 {
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1035 for (const auto& f : cfiles)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1036 {
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1037 std::string dfile = basename (f, true) + ".d", line;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1038
21927 6f62bd248919 use wrapper functions for mkoctfile and main John W. Eaton <jwe@octave.org> parents: 21852 diff changeset	1039 octave_unlink_wrapper (dfile.c_str ());
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1040
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1041 std::string cmd
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	1042 = (vars["CC"] + ' ' + vars["DEPEND_FLAGS"] + ' '
336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	1043 + vars["CPPFLAGS"] + ' ' + vars["ALL_CFLAGS"] + ' '
336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	1044 + incflags + ' ' + defs + ' ' + quote_path (f));
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1045
29006 139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1046 // FIXME: Use wide character API for popen on Windows.
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1047 FILE *fd = popen (cmd.c_str (), "r");
29006 139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1048
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1049 #if defined (OCTAVE_USE_WINDOWS_API)
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1050 // FIXME: liboctinterp isn't linked in to mkoctfile.
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1051 // So we cannot use octave::sys::ofstream. Instead we fall back
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1052 // on using the functions available from libwrappers.
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1053 size_t srclen = dfile.length ();
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1054 const uint8_t src = reinterpret_cast<const uint8_t >
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1055 (dfile.c_str ());
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1056
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1057 size_t length = 0;
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1058 wchar_t wchar = reinterpret_cast<wchar_t >
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1059 (octave_u8_conv_to_encoding ("wchar_t", src, srclen,
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1060 &length));
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1061
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1062 std::ofstream fo;
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1063 if (wchar != nullptr)
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1064 {
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1065 fo.open (wchar);
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1066 free (static_cast<void *> (wchar));
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1067 }
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1068 else
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1069 fo.open (dfile.c_str ());
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1070 #else
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	1071 std::ofstream fo (dfile.c_str ());
29006 139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1072 #endif
15458 1cc42df8ede7 mkoctfile.in.cc: Change variable types to stop compilation warnings. Rik <rik@octave.org> parents: 15309 diff changeset	1073 size_t pos;
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20713 diff changeset	1074 while (! feof (fd))
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1075 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1076 line = get_line (fd);
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	1077 if ((pos = line.rfind (".o:")) != std::string::npos)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1078 {
15458 1cc42df8ede7 mkoctfile.in.cc: Change variable types to stop compilation warnings. Rik <rik@octave.org> parents: 15309 diff changeset	1079 size_t spos = line.rfind ('/', pos);
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26853 diff changeset	1080 std::string ofile
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26853 diff changeset	1081 = (spos == std::string::npos
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26853 diff changeset	1082 ? line.substr (0, pos+2)
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26853 diff changeset	1083 : line.substr (spos+1, pos-spos+1));
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	1084 fo << "pic/" << ofile << ' ' << ofile << ' '
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	1085 << dfile << line.substr (pos) << std::endl;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1086 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1087 else
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	1088 fo << line << std::endl;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1089 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1090 pclose (fd);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1091 fo.close ();
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1092 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	1093
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1094 for (const auto& f : ccfiles)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1095 {
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1096 std::string dfile = basename (f, true) + ".d", line;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1097
21927 6f62bd248919 use wrapper functions for mkoctfile and main John W. Eaton <jwe@octave.org> parents: 21852 diff changeset	1098 octave_unlink_wrapper (dfile.c_str ());
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1099
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1100 std::string cmd
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	1101 = (vars["CXX"] + ' ' + vars["DEPEND_FLAGS"] + ' '
336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	1102 + vars["CPPFLAGS"] + ' ' + vars["ALL_CXXFLAGS"] + ' '
336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	1103 + incflags + ' ' + defs + ' ' + quote_path (f));
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1104
29006 139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1105 // FIXME: Use wide character API for popen on Windows.
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1106 FILE *fd = popen (cmd.c_str (), "r");
29006 139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1107
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1108 #if defined (OCTAVE_USE_WINDOWS_API)
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1109 // FIXME: liboctinterp isn't linked in to mkoctfile.
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1110 // So we cannot use octave::sys::ofstream. Instead we fall back
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1111 // on using the functions available from libwrappers.
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1112 size_t srclen = dfile.length ();
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1113 const uint8_t src = reinterpret_cast<const uint8_t >
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1114 (dfile.c_str ());
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1115
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1116 size_t length = 0;
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1117 wchar_t wchar = reinterpret_cast<wchar_t >
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1118 (octave_u8_conv_to_encoding ("wchar_t", src, srclen,
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1119 &length));
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1120
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1121 std::ofstream fo;
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1122 if (wchar != nullptr)
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1123 {
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1124 fo.open (wchar);
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1125 free (static_cast<void *> (wchar));
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1126 }
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1127 else
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1128 fo.open (dfile.c_str ());
139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1129 #else
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	1130 std::ofstream fo (dfile.c_str ());
29006 139df373c107 Use wide character overload to open file streams on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28882 diff changeset	1131 #endif
15458 1cc42df8ede7 mkoctfile.in.cc: Change variable types to stop compilation warnings. Rik <rik@octave.org> parents: 15309 diff changeset	1132 size_t pos;
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20713 diff changeset	1133 while (! feof (fd))
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1134 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1135 line = get_line (fd);
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	1136 if ((pos = line.rfind (".o:")) != std::string::npos)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1137 {
15458 1cc42df8ede7 mkoctfile.in.cc: Change variable types to stop compilation warnings. Rik <rik@octave.org> parents: 15309 diff changeset	1138 size_t spos = line.rfind ('/', pos);
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26853 diff changeset	1139 std::string ofile
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26853 diff changeset	1140 = (spos == std::string::npos
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26853 diff changeset	1141 ? line.substr (0, pos+2)
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26853 diff changeset	1142 : line.substr (spos+1, pos-spos+1));
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	1143 fo << "pic/" << ofile << ' ' << ofile << ' '
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	1144 << dfile << line.substr (pos+2) << std::endl;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1145 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1146 else
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	1147 fo << line << std::endl;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1148 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1149 pclose (fd);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1150 fo.close ();
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1151 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	1152
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1153 return 0;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1154 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	1155
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1156 for (const auto& f : f77files)
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1157 {
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20713 diff changeset	1158 if (! vars["F77"].empty ())
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1159 {
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	1160 std::string o;
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1161 if (compile_only)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1162 {
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1163 if (! outputfile.empty ())
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1164 o = outputfile;
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1165 else
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1166 o = basename (f, true) + ".o";
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1167 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1168 else
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1169 {
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1170 o = tmp_objfile_name ();
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1171
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1172 tmp_objfiles.push_back (o);
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1173
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1174 objfiles += (' ' + o);
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1175 }
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1176
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1177 std::string cmd
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	1178 = (vars["F77"] + " -c " + vars["FPICFLAG"] + ' '
336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	1179 + vars["ALL_FFLAGS"] + ' ' + incflags + ' ' + defs + ' '
336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	1180 + pass_on_options + ' ' + f + " -o " + o);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1181
28963 f29e4791a792 mkoctfile: eliminate global debug variable John W. Eaton <jwe@octave.org> parents: 28883 diff changeset	1182 int status = run_command (cmd, verbose, printonly);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1183
25510 2710440ea566 mkoctfile: fix logic error with handling of -c option (bug #54182) John W. Eaton <jwe@octave.org> parents: 25507 diff changeset	1184 if (status)
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1185 return status;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1186 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1187 else
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1188 {
18796 dd57ca9ef7e4 Add missing newline to error message from mkoctfile. Rik <rik@octave.org> parents: 18364 diff changeset	1189 std::cerr << "mkoctfile: no way to compile Fortran file " << f
dd57ca9ef7e4 Add missing newline to error message from mkoctfile. Rik <rik@octave.org> parents: 18364 diff changeset	1190 << std::endl;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1191 return 1;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1192 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1193 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	1194
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1195 for (const auto& f : cfiles)
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1196 {
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20713 diff changeset	1197 if (! vars["CC"].empty ())
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1198 {
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1199 std::string o;
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1200 if (compile_only)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1201 {
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1202 if (! outputfile.empty ())
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1203 o = outputfile;
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1204 else
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1205 o = basename (f, true) + ".o";
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1206 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1207 else
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1208 {
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1209 o = tmp_objfile_name ();
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1210
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1211 tmp_objfiles.push_back (o);
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1212
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1213 objfiles += (' ' + o);
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1214 }
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1215
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1216 std::string cmd
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	1217 = (vars["CC"] + " -c " + vars["CPPFLAGS"] + ' '
336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	1218 + vars["CPICFLAG"] + ' ' + vars["ALL_CFLAGS"] + ' '
336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	1219 + pass_on_options + ' ' + incflags + ' ' + defs + ' '
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1220 + quote_path (f) + " -o " + quote_path (o));
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1221
28963 f29e4791a792 mkoctfile: eliminate global debug variable John W. Eaton <jwe@octave.org> parents: 28883 diff changeset	1222 int status = run_command (cmd, verbose, printonly);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1223
25510 2710440ea566 mkoctfile: fix logic error with handling of -c option (bug #54182) John W. Eaton <jwe@octave.org> parents: 25507 diff changeset	1224 if (status)
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1225 return status;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1226 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1227 else
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1228 {
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	1229 std::cerr << "mkoctfile: no way to compile C file " << f
2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	1230 << std::endl;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1231 return 1;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1232 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1233 }
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1234
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1235 for (const auto& f : ccfiles)
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1236 {
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20713 diff changeset	1237 if (! vars["CXX"].empty ())
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1238 {
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1239 std::string o;
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1240 if (compile_only)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1241 {
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1242 if (! outputfile.empty ())
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1243 o = outputfile;
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1244 else
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1245 o = basename (f, true) + ".o";
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1246 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1247 else
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1248 {
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1249 o = tmp_objfile_name ();
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1250
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1251 tmp_objfiles.push_back (o);
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1252
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1253 objfiles += (' ' + o);
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1254 }
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1255
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1256 std::string cmd
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	1257 = (vars["CXX"] + " -c " + vars["CPPFLAGS"] + ' '
336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	1258 + vars["CXXPICFLAG"] + ' ' + vars["ALL_CXXFLAGS"] + ' '
336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23804 diff changeset	1259 + pass_on_options + ' ' + incflags + ' ' + defs + ' '
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1260 + quote_path (f) + " -o " + quote_path (o));
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1261
28963 f29e4791a792 mkoctfile: eliminate global debug variable John W. Eaton <jwe@octave.org> parents: 28883 diff changeset	1262 int status = run_command (cmd, verbose, printonly);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1263
25510 2710440ea566 mkoctfile: fix logic error with handling of -c option (bug #54182) John W. Eaton <jwe@octave.org> parents: 25507 diff changeset	1264 if (status)
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1265 return status;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1266 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1267 else
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1268 {
18364 2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	1269 std::cerr << "mkoctfile: no way to compile C++ file " << f
2e62b1f01bfe * mkoctfile.in.cc: Use std:: instead of using declarartion. John W. Eaton <jwe@octave.org> parents: 18363 diff changeset	1270 << std::endl;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1271 return 1;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1272 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1273 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	1274
26422 26be3dc2900f Use LDFLAGS for mkoctfile linker flags (bug #48678). Rik <rik@octave.org> parents: 26376 diff changeset	1275 // If we are only compiling, we are done.
25511 49d3c6344afe mkoctfile: fix one more logic error John W. Eaton <jwe@octave.org> parents: 25510 diff changeset	1276
49d3c6344afe mkoctfile: fix one more logic error John W. Eaton <jwe@octave.org> parents: 25510 diff changeset	1277 if (compile_only)
49d3c6344afe mkoctfile: fix one more logic error John W. Eaton <jwe@octave.org> parents: 25510 diff changeset	1278 return 0;
49d3c6344afe mkoctfile: fix one more logic error John W. Eaton <jwe@octave.org> parents: 25510 diff changeset	1279
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1280 if (objfiles.empty ())
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1281 {
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1282 std::cerr << "mkoctfile: no objects to link" << std::endl;
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1283 return 1;
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1284 }
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1285
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1286 std::string octave_libs;
25475 245de4f12ca3 link .oct files with liboctave and libinterp on Windows systems (bug #53627) John W. Eaton <jwe@octave.org> parents: 25447 diff changeset	1287
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1288 if (link_stand_alone)
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1289 {
27425 633f7a8347c8 Clean up implementation of CXXLD in build scripts (bug #56505). Rik <rik@octave.org> parents: 27277 diff changeset	1290 if (! vars["CXXLD"].empty ())
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1291 {
26612 ab5cc8da283c mkoctfile: restore LDFLAGS, warn only when LFLAGS used directly (bug #55447) Mike Miller <mtmiller@octave.org> parents: 26487 diff changeset	1292 octave_libs = "-L" + quote_path (vars["OCTLIBDIR"])
27934 49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	1293 + ' ' + vars["OCTAVE_LIBS"];
26431 ff6c90eb6f2d mkoctfile.in.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26422 diff changeset	1294
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1295 std::string cmd
27425 633f7a8347c8 Clean up implementation of CXXLD in build scripts (bug #56505). Rik <rik@octave.org> parents: 27277 diff changeset	1296 = (vars["CXXLD"] + ' ' + vars["CPPFLAGS"] + ' '
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1297 + vars["ALL_CXXFLAGS"] + ' ' + vars["RDYNAMIC_FLAG"] + ' '
28833 27df9b38391d mkoctfile.in.cc: Pass linker flags last (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28129 diff changeset	1298 + pass_on_options + ' ' + output_option + ' ' + objfiles + ' '
27df9b38391d mkoctfile.in.cc: Pass linker flags last (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28129 diff changeset	1299 + libfiles + ' ' + vars["ALL_LDFLAGS"] + ' ' + ldflags + ' '
27df9b38391d mkoctfile.in.cc: Pass linker flags last (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28129 diff changeset	1300 + vars["LFLAGS"] + ' ' + octave_libs + ' '
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1301 + vars["OCTAVE_LINK_OPTS"] + ' ' + vars["OCTAVE_LINK_DEPS"]);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1302
28963 f29e4791a792 mkoctfile: eliminate global debug variable John W. Eaton <jwe@octave.org> parents: 28883 diff changeset	1303 int status = run_command (cmd, verbose, printonly);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1304
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1305 clean_up_tmp_files (tmp_objfiles);
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1306
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1307 if (status)
b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1308 return status;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1309 }
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1310 else
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	1311 {
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1312 std::cerr
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1313 << "mkoctfile: no way to link stand-alone executable file"
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1314 << std::endl;
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1315 return 1;
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1316 }
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1317 }
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1318 else
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1319 {
26431 ff6c90eb6f2d mkoctfile.in.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26422 diff changeset	1320 #if defined (OCTAVE_USE_WINDOWS_API) \|\| defined(CROSS)
26612 ab5cc8da283c mkoctfile: restore LDFLAGS, warn only when LFLAGS used directly (bug #55447) Mike Miller <mtmiller@octave.org> parents: 26487 diff changeset	1321 octave_libs = "-L" + quote_path (vars["OCTLIBDIR"])
27934 49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	1322 + ' ' + vars["OCTAVE_LIBS"];
26431 ff6c90eb6f2d mkoctfile.in.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26422 diff changeset	1323 #endif
ff6c90eb6f2d mkoctfile.in.cc: Fix static analyzer detected issues (bug #55347). Rik <rik@octave.org> parents: 26422 diff changeset	1324
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1325 std::string cmd
27425 633f7a8347c8 Clean up implementation of CXXLD in build scripts (bug #56505). Rik <rik@octave.org> parents: 27277 diff changeset	1326 = (vars["CXXLD"] + ' ' + vars["ALL_CXXFLAGS"] + ' '
28833 27df9b38391d mkoctfile.in.cc: Pass linker flags last (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28129 diff changeset	1327 + pass_on_options + " -o " + octfile + ' ' + objfiles + ' '
27df9b38391d mkoctfile.in.cc: Pass linker flags last (bug #59173). Markus Mützel <markus.muetzel@gmx.de> parents: 28129 diff changeset	1328 + libfiles + ' ' + vars["DL_LDFLAGS"] + ' ' + vars["LDFLAGS"] + ' '
26612 ab5cc8da283c mkoctfile: restore LDFLAGS, warn only when LFLAGS used directly (bug #55447) Mike Miller <mtmiller@octave.org> parents: 26487 diff changeset	1329 + ldflags + ' ' + vars["LFLAGS"] + ' ' + octave_libs + ' '
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1330 + vars["OCT_LINK_OPTS"] + ' ' + vars["OCT_LINK_DEPS"]);
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1331
28048 42921bff241a Fix mkoctfile on Windows platforms when compiling Fortran sources (bug #49548). Mike Miller <mtmiller@octave.org> parents: 27934 diff changeset	1332 #if defined (OCTAVE_USE_WINDOWS_API) \|\| defined(CROSS)
42921bff241a Fix mkoctfile on Windows platforms when compiling Fortran sources (bug #49548). Mike Miller <mtmiller@octave.org> parents: 27934 diff changeset	1333 if (! f77files.empty () && ! vars["FLIBS"].empty ())
42921bff241a Fix mkoctfile on Windows platforms when compiling Fortran sources (bug #49548). Mike Miller <mtmiller@octave.org> parents: 27934 diff changeset	1334 cmd += ' ' + vars["FLIBS"];
42921bff241a Fix mkoctfile on Windows platforms when compiling Fortran sources (bug #49548). Mike Miller <mtmiller@octave.org> parents: 27934 diff changeset	1335 #endif
42921bff241a Fix mkoctfile on Windows platforms when compiling Fortran sources (bug #49548). Mike Miller <mtmiller@octave.org> parents: 27934 diff changeset	1336
28963 f29e4791a792 mkoctfile: eliminate global debug variable John W. Eaton <jwe@octave.org> parents: 28883 diff changeset	1337 int status = run_command (cmd, verbose, printonly);
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1338
25497 18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1339 clean_up_tmp_files (tmp_objfiles);
18f5f91f7348 mkoctfile: use tmp store tmp .o files in tmp directory (bug #54182) John W. Eaton <jwe@octave.org> parents: 25495 diff changeset	1340
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1341 if (status)
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1342 return status;
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1343 }
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1344
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1345 if (strip)
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1346 {
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1347 std::string cmd = "strip " + octfile;
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1348
28963 f29e4791a792 mkoctfile: eliminate global debug variable John W. Eaton <jwe@octave.org> parents: 28883 diff changeset	1349 int status = run_command (cmd, verbose, printonly);
25494 f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1350
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1351 if (status)
f35bd5cddedd mkoctfile: disallow -c and -o with multiple source files John W. Eaton <jwe@octave.org> parents: 25491 diff changeset	1352 return status;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	1353 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	1354
22866 b5cf18f8c18b style fixes for mkoctfile.cc John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	1355 return 0;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	1356 }

Mercurial > octave

annotate src/mkoctfile.in.cc @ 29237:1af06a145d40