Mercurial > octave

comparison libinterp/corefcn/toplev.cc @ 21607:37f6ed8a6f1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
store liboctave and liboctinterp hg ids separately * liboctinterp-build-info.h: Rename from build-info.h. * liboctinterp-build-info.in.cc: Rename from build-info.in.cc. * liboctinterp-build-info.h, liboctinterp-build-info.in.cc (liboctinterp_hg_id): Rename function from octave_hg_id. * libinterp/module.mk: Update. * liboctave/liboctave-build-info.h, liboctave/liboctave-build-info.in.cc: New files. * liboctave/module.mk: Update. * toplev.cc: Include both liboctave-build-info.h and liboctinterp-build-info.h. (F__octave_config_info__): Replace hg_id field with liboctave_hg_id and liboctinterp_hg_id fields.
author John W. Eaton <jwe@octave.org>
date Mon, 11 Apr 2016 12:16:19 -0400
parents e6f76c393ad7
children 80258bb3a14b
comparison
equal deleted inserted replaced
21606:ec01be3b8f5d 21607:37f6ed8a6f1b
50 #include "quit.h" 50 #include "quit.h"
51 #include "singleton-cleanup.h" 51 #include "singleton-cleanup.h"
52 #include "str-vec.h" 52 #include "str-vec.h"
53 53
54 #include "build-env.h" 54 #include "build-env.h"
55 #include "build-info.h" 55 #include "liboctave-build-info.h"
56 #include "liboctinterp-build-info.h"
56 #include "defaults.h" 57 #include "defaults.h"
57 #include "defun.h" 58 #include "defun.h"
58 #include "error.h" 59 #include "error.h"
59 #include "file-io.h" 60 #include "file-io.h"
60 #include "graphics.h" 61 #include "graphics.h"
1429 { "datarootdir", subst_octave_home (OCTAVE_DATAROOTDIR) }, 1430 { "datarootdir", subst_octave_home (OCTAVE_DATAROOTDIR) },
1430 { "exec_prefix", subst_octave_home (OCTAVE_EXEC_PREFIX) }, 1431 { "exec_prefix", subst_octave_home (OCTAVE_EXEC_PREFIX) },
1431 { "fcnfiledir", subst_octave_home (OCTAVE_FCNFILEDIR) }, 1432 { "fcnfiledir", subst_octave_home (OCTAVE_FCNFILEDIR) },
1432 { "fftw_version", octave_fftw_version () }, 1433 { "fftw_version", octave_fftw_version () },
1433 { "fftwf_version", octave_fftwf_version () }, 1434 { "fftwf_version", octave_fftwf_version () },
1434 { "hg_id", octave_hg_id () },
1435 { "imagedir", subst_octave_home (OCTAVE_IMAGEDIR) }, 1435 { "imagedir", subst_octave_home (OCTAVE_IMAGEDIR) },
1436 { "includedir", subst_octave_home (OCTAVE_INCLUDEDIR) }, 1436 { "includedir", subst_octave_home (OCTAVE_INCLUDEDIR) },
1437 { "infodir", subst_octave_home (OCTAVE_INFODIR) }, 1437 { "infodir", subst_octave_home (OCTAVE_INFODIR) },
1438 { "infofile", subst_octave_home (OCTAVE_INFOFILE) }, 1438 { "infofile", subst_octave_home (OCTAVE_INFOFILE) },
1439 { "libdir", subst_octave_home (OCTAVE_LIBDIR) }, 1439 { "libdir", subst_octave_home (OCTAVE_LIBDIR) },
1440 { "libexecdir", subst_octave_home (OCTAVE_LIBEXECDIR) }, 1440 { "libexecdir", subst_octave_home (OCTAVE_LIBEXECDIR) },
1441 // The liboctave and liboctinterp hg ids should always be the
1442 // same, but it is possible for someone to accidentally have a
1443 // mismatched pair so we record both separately so that we can
1444 // ensure that they are consistent.
1445 { "liboctave_hg_id", liboctave_hg_id () },
1446 { "liboctinterp_hg_id", liboctinterp_hg_id () },
1441 { "localapiarchlibdir", subst_octave_home (OCTAVE_LOCALAPIARCHLIBDIR) }, 1447 { "localapiarchlibdir", subst_octave_home (OCTAVE_LOCALAPIARCHLIBDIR) },
1442 { "localapifcnfiledir", subst_octave_home (OCTAVE_LOCALAPIFCNFILEDIR) }, 1448 { "localapifcnfiledir", subst_octave_home (OCTAVE_LOCALAPIFCNFILEDIR) },
1443 { "localapioctfiledir", subst_octave_home (OCTAVE_LOCALAPIOCTFILEDIR) }, 1449 { "localapioctfiledir", subst_octave_home (OCTAVE_LOCALAPIOCTFILEDIR) },
1444 { "localarchlibdir", subst_octave_home (OCTAVE_LOCALARCHLIBDIR) }, 1450 { "localarchlibdir", subst_octave_home (OCTAVE_LOCALARCHLIBDIR) },
1445 { "localfcnfiledir", subst_octave_home (OCTAVE_LOCALFCNFILEDIR) }, 1451 { "localfcnfiledir", subst_octave_home (OCTAVE_LOCALFCNFILEDIR) },