[haiku-commits] BRANCH HaikuPM-github.package-management [3f85cfc] src/bin headers/os/storage src/system/libroot/os

From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
To: haiku-commits@xxxxxxxxxxxxx
Date: Wed, 24 Apr 2013 15:00:31 +0200 (CEST)
added 1 changeset to branch 'refs/remotes/HaikuPM-github/package-management'
old head: ffeecbcc87d8ebf8abd4c1395fcf63f8645415ed
new head: 3f85cfc1322254c2be3b8ef4aa54ea39616e91ed
overview: https://github.com/haiku/HaikuPM/compare/ffeecbc...3f85cfc

----------------------------------------------------------------------------

3f85cfc: Add a few missing directory_which constants

                                    [ Ingo Weinhold <ingo_weinhold@xxxxxx> ]

----------------------------------------------------------------------------

Commit:      3f85cfc1322254c2be3b8ef4aa54ea39616e91ed
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Wed Apr 24 12:55:03 2013 UTC

----------------------------------------------------------------------------

3 files changed, 12 insertions(+)
headers/os/storage/FindDirectory.h       | 4 ++++
src/bin/finddir.c                        | 4 ++++
src/system/libroot/os/find_directory.cpp | 4 ++++

----------------------------------------------------------------------------

diff --git a/headers/os/storage/FindDirectory.h 
b/headers/os/storage/FindDirectory.h
index e5550cf..4f84e58 100644
--- a/headers/os/storage/FindDirectory.h
+++ b/headers/os/storage/FindDirectory.h
@@ -68,6 +68,7 @@ typedef enum {
        B_COMMON_NONPACKAGED_DOCUMENTATION_DIRECTORY,
        B_COMMON_NONPACKAGED_LIB_DIRECTORY,
        B_COMMON_NONPACKAGED_HEADERS_DIRECTORY,
+       B_COMMON_NONPACKAGED_DEVELOP_DIRECTORY,
 
        /* User directories. These are interpreted in the context
           of the user making the find_directory call. */
@@ -98,6 +99,9 @@ typedef enum {
        B_USER_NONPACKAGED_DOCUMENTATION_DIRECTORY,
        B_USER_NONPACKAGED_LIB_DIRECTORY,
        B_USER_NONPACKAGED_HEADERS_DIRECTORY,
+       B_USER_NONPACKAGED_DEVELOP_DIRECTORY,
+       B_USER_DEVELOP_DIRECTORY,
+       B_USER_DOCUMENTATION_DIRECTORY,
 
        /* Global directories. */
        B_APPS_DIRECTORY                                        = 4000,
diff --git a/src/bin/finddir.c b/src/bin/finddir.c
index 1f659d7..d578ddd 100644
--- a/src/bin/finddir.c
+++ b/src/bin/finddir.c
@@ -86,6 +86,7 @@ directoryType directoryTypes[] = {
        KEYVALUE_PAIR(B_COMMON_NONPACKAGED_DOCUMENTATION_DIRECTORY),
        KEYVALUE_PAIR(B_COMMON_NONPACKAGED_LIB_DIRECTORY),
        KEYVALUE_PAIR(B_COMMON_NONPACKAGED_HEADERS_DIRECTORY),
+       KEYVALUE_PAIR(B_COMMON_NONPACKAGED_DEVELOP_DIRECTORY),
 
        // User directories
        KEYVALUE_PAIR(B_USER_DIRECTORY),
@@ -103,6 +104,8 @@ directoryType directoryTypes[] = {
        KEYVALUE_PAIR(B_USER_DATA_DIRECTORY),
        KEYVALUE_PAIR(B_USER_CACHE_DIRECTORY),
        KEYVALUE_PAIR(B_USER_PACKAGES_DIRECTORY),
+       KEYVALUE_PAIR(B_USER_DEVELOP_DIRECTORY),
+       KEYVALUE_PAIR(B_USER_DOCUMENTATION_DIRECTORY),
        KEYVALUE_PAIR(B_USER_HEADERS_DIRECTORY),
        KEYVALUE_PAIR(B_USER_NONPACKAGED_DIRECTORY),
        KEYVALUE_PAIR(B_USER_NONPACKAGED_ADDONS_DIRECTORY),
@@ -115,6 +118,7 @@ directoryType directoryTypes[] = {
        KEYVALUE_PAIR(B_USER_NONPACKAGED_DOCUMENTATION_DIRECTORY),
        KEYVALUE_PAIR(B_USER_NONPACKAGED_LIB_DIRECTORY),
        KEYVALUE_PAIR(B_USER_NONPACKAGED_HEADERS_DIRECTORY),
+       KEYVALUE_PAIR(B_USER_NONPACKAGED_DEVELOP_DIRECTORY),
 
        // Legacy system directories
        KEYVALUE_PAIR(B_BEOS_DIRECTORY),
diff --git a/src/system/libroot/os/find_directory.cpp 
b/src/system/libroot/os/find_directory.cpp
index 659b9f2..7556f29 100644
--- a/src/system/libroot/os/find_directory.cpp
+++ b/src/system/libroot/os/find_directory.cpp
@@ -103,6 +103,7 @@ static const char *kCommonDirectories[] = {
        COMMON NON_PACKAGED "/documentation",
        COMMON NON_PACKAGED "/lib",
        COMMON NON_PACKAGED "/develop/headers",
+       COMMON NON_PACKAGED "/develop",
 };
 
 /* User directories */
@@ -138,6 +139,9 @@ static const char *kUserDirectories[] = {
        HOME CONFIG NON_PACKAGED "/documentation",
        HOME CONFIG NON_PACKAGED "/lib",
        HOME CONFIG NON_PACKAGED "/develop/headers",
+       HOME CONFIG NON_PACKAGED "/develop",
+       HOME CONFIG "/develop",
+       HOME CONFIG "/documentation",
 };
[haiku-commits] BRANCH HaikuPM-github.package-management [3f85cfc] src/bin headers/os/storage src/system/libroot/os

Other related posts:
