Mercurial > hg > octave-nkf

comparison src/mkoctfile.in.cc @ 15309:c398dde4d409

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mkoctfile.in.cc: Remove unneeded "std::" namespace decorators * mkoctfile.in.cc: Remove unneeded "std::" namespace decorators
author Rik <rik@octave.org>
date Wed, 05 Sep 2012 20:31:48 -0700
parents 8bd5c490b787
children 1cc42df8ede7
comparison
equal deleted inserted replaced
15308:a4d7909c4edb 15309:c398dde4d409
47 static bool initialized = false; 47 static bool initialized = false;
48 static map<string,string> vars; 48 static map<string,string> vars;
49 49
50 static string OCTAVE_VERSION = %OCTAVE_CONF_VERSION%; 50 static string OCTAVE_VERSION = %OCTAVE_CONF_VERSION%;
51 51
52 static std::string 52 static string
53 substitute_prefix (const std::string& s, const std::string& prefix, 53 substitute_prefix (const string& s, const string& prefix,
54 const std::string& new_prefix) 54 const string& new_prefix)
55 { 55 {
56 std::string retval = s; 56 string retval = s;
57 57
58 if (!prefix.empty () && new_prefix != prefix) 58 if (!prefix.empty () && new_prefix != prefix)
59 { 59 {
60 int len = prefix.length (); 60 int len = prefix.length ();
61 if (retval.find (prefix) == 0) 61 if (retval.find (prefix) == 0)
62 retval.replace (0, len, new_prefix); 62 retval.replace (0, len, new_prefix);
63 } 63 }
64 64
65 #if defined (__WIN32__) && ! defined (_POSIX_VERSION) 65 #if defined (__WIN32__) && ! defined (_POSIX_VERSION)
66 std::replace (retval.begin (), retval.end (), '/', '\\'); 66 replace (retval.begin (), retval.end (), '/', '\\');
67 #endif 67 #endif
68 68
69 return retval; 69 return retval;
70 } 70 }
71 71
122 vars["OCTAVE_HOME"] = get_variable ("OCTAVE_HOME", ""); 122 vars["OCTAVE_HOME"] = get_variable ("OCTAVE_HOME", "");
123 123
124 #if defined (__WIN32__) && ! defined (_POSIX_VERSION) 124 #if defined (__WIN32__) && ! defined (_POSIX_VERSION)
125 int n = 1024; 125 int n = 1024;
126 126
127 std::string bin_dir (n, '\0'); 127 string bin_dir (n, '\0');
128 128
129 while (true) 129 while (true)
130 { 130 {
131 int status = GetModuleFileName (0, &bin_dir[0], n); 131 int status = GetModuleFileName (0, &bin_dir[0], n);
132 132
153 153
154 vars["SED"] = get_variable ("SED", %OCTAVE_CONF_SED%); 154 vars["SED"] = get_variable ("SED", %OCTAVE_CONF_SED%);
155 155
156 vars["OCTAVE_PREFIX"] = %OCTAVE_CONF_PREFIX%; 156 vars["OCTAVE_PREFIX"] = %OCTAVE_CONF_PREFIX%;
157 157
158 std::string DEFAULT_OCTINCLUDEDIR = %OCTAVE_CONF_OCTINCLUDEDIR%; 158 string DEFAULT_OCTINCLUDEDIR = %OCTAVE_CONF_OCTINCLUDEDIR%;
159 std::string DEFAULT_INCLUDEDIR = %OCTAVE_CONF_INCLUDEDIR%; 159 string DEFAULT_INCLUDEDIR = %OCTAVE_CONF_INCLUDEDIR%;
160 std::string DEFAULT_LIBDIR = %OCTAVE_CONF_LIBDIR%; 160 string DEFAULT_LIBDIR = %OCTAVE_CONF_LIBDIR%;
161 std::string DEFAULT_OCTLIBDIR = %OCTAVE_CONF_OCTLIBDIR%; 161 string DEFAULT_OCTLIBDIR = %OCTAVE_CONF_OCTLIBDIR%;
162 162
163 if (! vars["OCTAVE_HOME"].empty ()) 163 if (! vars["OCTAVE_HOME"].empty ())
164 { 164 {
165 DEFAULT_OCTINCLUDEDIR 165 DEFAULT_OCTINCLUDEDIR
166 = substitute_prefix (DEFAULT_OCTINCLUDEDIR, vars["OCTAVE_PREFIX"], 166 = substitute_prefix (DEFAULT_OCTINCLUDEDIR, vars["OCTAVE_PREFIX"],
183 vars["INCLUDEDIR"] = get_variable ("INCLUDEDIR", DEFAULT_INCLUDEDIR); 183 vars["INCLUDEDIR"] = get_variable ("INCLUDEDIR", DEFAULT_INCLUDEDIR);
184 vars["LIBDIR"] = get_variable ("LIBDIR", DEFAULT_LIBDIR); 184 vars["LIBDIR"] = get_variable ("LIBDIR", DEFAULT_LIBDIR);
185 vars["OCTLIBDIR"] = get_variable ("OCTLIBDIR", DEFAULT_OCTLIBDIR); 185 vars["OCTLIBDIR"] = get_variable ("OCTLIBDIR", DEFAULT_OCTLIBDIR);
186 186
187 #if defined (__WIN32__) && ! defined (_POSIX_VERSION) 187 #if defined (__WIN32__) && ! defined (_POSIX_VERSION)
188 std::string DEFAULT_INCFLAGS 188 string DEFAULT_INCFLAGS
189 = "-I" + quote_path (vars["OCTINCLUDEDIR"] + "\\..") 189 = "-I" + quote_path (vars["OCTINCLUDEDIR"] + "\\..")
190 + " -I" + quote_path (vars["OCTINCLUDEDIR"]); 190 + " -I" + quote_path (vars["OCTINCLUDEDIR"]);
191 #else 191 #else
192 std::string DEFAULT_INCFLAGS 192 string DEFAULT_INCFLAGS
193 = "-I" + quote_path (vars["OCTINCLUDEDIR"] + "/..") 193 = "-I" + quote_path (vars["OCTINCLUDEDIR"] + "/..")
194 + " -I" + quote_path (vars["OCTINCLUDEDIR"]); 194 + " -I" + quote_path (vars["OCTINCLUDEDIR"]);
195 #endif 195 #endif
196 if (vars["INCLUDEDIR"] != "/usr/include") 196 if (vars["INCLUDEDIR"] != "/usr/include")
197 DEFAULT_INCFLAGS += " -I" + quote_path (vars["INCLUDEDIR"]); 197 DEFAULT_INCFLAGS += " -I" + quote_path (vars["INCLUDEDIR"]);
198 198
199 std::string DEFAULT_LFLAGS = "-L" + quote_path (vars["OCTLIBDIR"]); 199 string DEFAULT_LFLAGS = "-L" + quote_path (vars["OCTLIBDIR"]);
200 if (vars["LIBDIR"] != "/usr/lib") 200 if (vars["LIBDIR"] != "/usr/lib")
201 DEFAULT_LFLAGS += " -L" + quote_path (vars["LIBDIR"]); 201 DEFAULT_LFLAGS += " -L" + quote_path (vars["LIBDIR"]);
202 202
203 vars["CPPFLAGS"] = get_variable ("CPPFLAGS", %OCTAVE_CONF_CPPFLAGS%); 203 vars["CPPFLAGS"] = get_variable ("CPPFLAGS", %OCTAVE_CONF_CPPFLAGS%);
204 vars["INCFLAGS"] = get_variable ("INCFLAGS", DEFAULT_INCFLAGS); 204 vars["INCFLAGS"] = get_variable ("INCFLAGS", DEFAULT_INCFLAGS);