Revision: 77287
http://sourceforge.net/p/brlcad/code/77287
Author: starseeker
Date: 2020-09-30 15:50:47 +0000 (Wed, 30 Sep 2020)
Log Message:
-----------
Add the install target to bu_dir, so we can tell if we're running from the
install target location or not.
Modified Paths:
--------------
brlcad/trunk/include/bu/app.h
brlcad/trunk/src/libbu/dir.c
brlcad/trunk/src/libtclcad/bu.c
Modified: brlcad/trunk/include/bu/app.h
===================================================================
--- brlcad/trunk/include/bu/app.h 2020-09-30 15:24:43 UTC (rev 77286)
+++ brlcad/trunk/include/bu/app.h 2020-09-30 15:50:47 UTC (rev 77287)
@@ -237,6 +237,7 @@
BU_DIR_DATA, /**< (read-only) data files (share) */
BU_DIR_DOC, /**< (read-only) documentation, (DATA/doc) */
BU_DIR_MAN, /**< (read-only) manual pages, (DATA/man) */
+ BU_DIR_INSTALL, /**< (read-only) root dir of install target */
BU_DIR_TEMP, /**< (read/write) temporary files (TEMP) */
BU_DIR_HOME, /**< (read/write) user home directory (HOME) */
BU_DIR_CACHE, /**< (read/write) user cache directory (BU_CACHE_DIR) */
Modified: brlcad/trunk/src/libbu/dir.c
===================================================================
--- brlcad/trunk/src/libbu/dir.c 2020-09-30 15:24:43 UTC (rev 77286)
+++ brlcad/trunk/src/libbu/dir.c 2020-09-30 15:50:47 UTC (rev 77287)
@@ -561,6 +561,9 @@
cpath = _bu_dir_brlcad_root(BRLCAD_MAN_DIR, 1);
path_append(&vls, cpath);
break;
+ case BU_DIR_INSTALL:
+ bu_vls_strcat(&vls, BRLCAD_ROOT);
+ break;
case BU_DIR_TEMP:
cpath = dir_temp(buf, MAXPATHLEN);
path_append(&vls, cpath);
Modified: brlcad/trunk/src/libtclcad/bu.c
===================================================================
--- brlcad/trunk/src/libtclcad/bu.c 2020-09-30 15:24:43 UTC (rev 77286)
+++ brlcad/trunk/src/libtclcad/bu.c 2020-09-30 15:50:47 UTC (rev 77287)
@@ -318,6 +318,10 @@
snprintf(result, MAXPATHLEN, "%s", bu_dir(NULL, 0, BU_DIR_MAN, NULL));
return result;
}
+ if (BU_STR_EQUIV(dirkey, "install") || BU_STR_EQUAL(dirkey,
"BU_DIR_INSTALL")) {
+ snprintf(result, MAXPATHLEN, "%s", bu_dir(NULL, 0, BU_DIR_INSTALL,
NULL));
+ return result;
+ }
if (BU_STR_EQUIV(dirkey, "temp") || BU_STR_EQUAL(dirkey, "BU_DIR_TEMP")) {
snprintf(result, MAXPATHLEN, "%s", bu_dir(NULL, 0, BU_DIR_TEMP, NULL));
return result;
@@ -365,7 +369,7 @@
{
Tcl_Interp *interp = (Tcl_Interp *)clientData;
if (argc != 2) {
- bu_log("Usage: bu_dir
[curr|init|bin|lib|libexec|include|data|doc|man|temp|home|cache|config|ext|libext]\n");
+ bu_log("Usage: bu_dir
[curr|init|bin|lib|libexec|include|data|doc|man|install|temp|home|cache|config|ext|libext]\n");
return BRLCAD_ERROR;
}
Tcl_AppendResult(interp, _tclcad_bu_dir_print(argv[1],1), NULL);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
