Flat commit of all changes from package-management branch in svn

headers/config/HaikuConfig.h

@@ -9,6 +9,7 @@
 /* Determine the architecture and define macros for some fundamental
    properties:
    __HAIKU_ARCH					- short name of the architecture (used in paths)
+   __HAIKU_ARCH_ABI				- name of ABI (as in package architecture)
    __HAIKU_ARCH_<arch>			- defined to 1 for the respective architecture
    __HAIKU_ARCH_BITS			- defined to 32/64 on 32/64 bit architectures
    								  (defaults to 32)
@@ -19,25 +20,35 @@
 */
 #ifdef __INTEL__
 #	define __HAIKU_ARCH					x86
+#	if __GNUC__ == 2
+#		define __HAIKU_ARCH_ABI			"x86_gcc2"
+#	else
+#		define __HAIKU_ARCH_ABI			"x86"
+#	endif
 #	define __HAIKU_ARCH_X86				1
 #	define __HAIKU_ARCH_PHYSICAL_BITS	64
 #elif __x86_64__
 #	define __HAIKU_ARCH					x86_64
+#	define __HAIKU_ARCH_ABI				"x86_64"
 #	define __HAIKU_ARCH_X86_64			1
 #	define __HAIKU_ARCH_BITS			64
 #elif __POWERPC__
 #	define __HAIKU_ARCH					ppc
+#	define __HAIKU_ARCH_ABI				"ppc"
 #	define __HAIKU_ARCH_PPC				1
 #	define __HAIKU_BIG_ENDIAN			1
 #elif __M68K__
 #	define __HAIKU_ARCH					m68k
+#	define __HAIKU_ARCH_ABI				"m68k"
 #	define __HAIKU_ARCH_M68K			1
 #	define __HAIKU_BIG_ENDIAN			1
 #elif __MIPSEL__
 #	define __HAIKU_ARCH					mipsel
+#	define __HAIKU_ARCH_ABI				"mipsel"
 #	define __HAIKU_ARCH_MIPSEL			1
 #elif __ARM__
 #	define __HAIKU_ARCH					arm
+#	define __HAIKU_ARCH_ABI				"arm"
 #	define __HAIKU_ARCH_ARM				1
 #else
 #	error Unsupported architecture!

headers/os/BeBuild.h

@@ -39,6 +39,8 @@
 #define B_HAIKU_ABI_GCC_2_BEOS			0x00020001
 #define B_HAIKU_ABI_GCC_2_HAIKU			0x00020002
 
+#define B_HAIKU_ABI_NAME				__HAIKU_ARCH_ABI
+
 #if __GNUC__ == 2
 #	define B_HAIKU_ABI					B_HAIKU_ABI_GCC_2_HAIKU
 #elif __GNUC__ == 4

headers/os/storage/FindDirectory.h

@@ -29,6 +29,9 @@ typedef enum {
 	B_SYSTEM_MEDIA_NODES_DIRECTORY,
 	B_SYSTEM_SOUNDS_DIRECTORY,
 	B_SYSTEM_DATA_DIRECTORY,
+	B_SYSTEM_DEVELOP_DIRECTORY,
+	B_SYSTEM_PACKAGES_DIRECTORY,
+	B_SYSTEM_HEADERS_DIRECTORY,
 
 	/* Common directories, shared among all users. */
 	B_COMMON_DIRECTORY					= 2000,
@@ -52,6 +55,19 @@ typedef enum {
 	B_COMMON_SOUNDS_DIRECTORY,
 	B_COMMON_DATA_DIRECTORY,
 	B_COMMON_CACHE_DIRECTORY,
+	B_COMMON_PACKAGES_DIRECTORY,
+	B_COMMON_HEADERS_DIRECTORY,
+	B_COMMON_NONPACKAGED_DIRECTORY,
+	B_COMMON_NONPACKAGED_ADDONS_DIRECTORY,
+	B_COMMON_NONPACKAGED_TRANSLATORS_DIRECTORY,
+	B_COMMON_NONPACKAGED_MEDIA_NODES_DIRECTORY,
+	B_COMMON_NONPACKAGED_BIN_DIRECTORY,
+	B_COMMON_NONPACKAGED_DATA_DIRECTORY,
+	B_COMMON_NONPACKAGED_FONTS_DIRECTORY,
+	B_COMMON_NONPACKAGED_SOUNDS_DIRECTORY,
+	B_COMMON_NONPACKAGED_DOCUMENTATION_DIRECTORY,
+	B_COMMON_NONPACKAGED_LIB_DIRECTORY,
+	B_COMMON_NONPACKAGED_HEADERS_DIRECTORY,
 
 	/* User directories. These are interpreted in the context
 	   of the user making the find_directory call. */
@@ -69,11 +85,25 @@ typedef enum {
 	B_USER_SOUNDS_DIRECTORY,
 	B_USER_DATA_DIRECTORY,
 	B_USER_CACHE_DIRECTORY,
+	B_USER_PACKAGES_DIRECTORY,
+	B_USER_HEADERS_DIRECTORY,
+	B_USER_NONPACKAGED_DIRECTORY,
+	B_USER_NONPACKAGED_ADDONS_DIRECTORY,
+	B_USER_NONPACKAGED_TRANSLATORS_DIRECTORY,
+	B_USER_NONPACKAGED_MEDIA_NODES_DIRECTORY,
+	B_USER_NONPACKAGED_BIN_DIRECTORY,
+	B_USER_NONPACKAGED_DATA_DIRECTORY,
+	B_USER_NONPACKAGED_FONTS_DIRECTORY,
+	B_USER_NONPACKAGED_SOUNDS_DIRECTORY,
+	B_USER_NONPACKAGED_DOCUMENTATION_DIRECTORY,
+	B_USER_NONPACKAGED_LIB_DIRECTORY,
+	B_USER_NONPACKAGED_HEADERS_DIRECTORY,
 
 	/* Global directories. */
 	B_APPS_DIRECTORY					= 4000,
 	B_PREFERENCES_DIRECTORY,
 	B_UTILITIES_DIRECTORY,
+	B_PACKAGE_LINKS_DIRECTORY,
 
 	/* Obsolete: Legacy BeOS definition to be phased out */
 	B_BEOS_DIRECTORY					= 1000,

headers/private/libroot/directories.h

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2011, Oliver Tappe <[email protected]>
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _LIBROOT_DIRECTORIES_H
+#define _LIBROOT_DIRECTORIES_H
+
+
+#define kGlobalBinDirectory 			"/bin"
+#define kGlobalEtcDirectory 			"/etc"
+#define kGlobalPackageLinksDirectory	"/package-links"
+#define kGlobalSystemDirectory 			"/system"
+#define kGlobalTempDirectory 			"/tmp"
+#define kGlobalVarDirectory 			"/var"
+
+#define kAppsDirectory 					"/boot/apps"
+#define kPreferencesDirectory 			"/boot/preferences"
+
+#define kAppLocalAddonsDirectory 		"%A/add-ons"
+#define kAppLocalLibDirectory 			"%A/lib"
+
+#define kVolumeLocalSystemKernelAddonsDirectory	"system/add-ons/kernel"
+#define kVolumeLocalCommonNonpackagedKernelAddonsDirectory	\
+	"common/non-packaged/add-ons/kernel"
+#define kVolumeLocalCommonKernelAddonsDirectory	"common/add-ons/kernel"
+#define kVolumeLocalUserNonpackagedKernelAddonsDirectory	\
+	"home/config/non-packaged/add-ons/kernel"
+#define kVolumeLocalUserKernelAddonsDirectory	"home/config/add-ons/kernel"
+
+#define kSystemDirectory 				"/boot/system"
+#define kSystemAddonsDirectory 			"/boot/system/add-ons"
+#define kSystemAppsDirectory 			"/boot/system/apps"
+#define kSystemBinDirectory 			"/boot/system/bin"
+#define kSystemDataDirectory 			"/boot/system/data"
+#define kSystemDevelopDirectory 		"/boot/system/develop"
+#define kSystemLibDirectory 			"/boot/system/lib"
+#define kSystemPackagesDirectory 		"/boot/system/packages"
+#define kSystemPreferencesDirectory 	"/boot/system/preferences"
+#define kSystemServersDirectory 		"/boot/system/servers"
+
+#define kCommonDirectory 				"/boot/common"
+#define kCommonAddonsDirectory 			"/boot/common/add-ons"
+#define kCommonBinDirectory 			"/boot/common/bin"
+#define kCommonDevelopToolsBinDirectory "/boot/common/develop/tools/current/bin"
+#define kCommonEtcDirectory 			"/boot/common/settings/etc"
+#define kCommonLibDirectory 			"/boot/common/lib"
+#define kCommonPackagesDirectory 		"/boot/common/packages"
+#define kCommonSettingsDirectory 		"/boot/common/settings"
+#define kCommonTempDirectory 			"/boot/common/cache/tmp"
+#define kCommonVarDirectory 			"/boot/common/var"
+#define kCommonLogDirectory 			"/boot/common/var/log"
+#define kCommonNonpackagedAddonsDirectory	"/boot/common/non-packaged/add-ons"
+#define kCommonNonpackagedBinDirectory 	"/boot/common/non-packaged/bin"
+#define kCommonNonpackagedLibDirectory 	"/boot/common/non-packaged/lib"
+
+#define kUserDirectory 					"/boot/home"
+#define kUserConfigDirectory 			"/boot/home/config"
+#define kUserAddonsDirectory 			"/boot/home/config/add-ons"
+#define kUserBinDirectory 				"/boot/home/config/bin"
+#define kUserLibDirectory 				"/boot/home/config/lib"
+#define kUserPackagesDirectory	 		"/boot/home/config/packages"
+#define kUserSettingsDirectory 			"/boot/home/config/settings"
+#define kUserNonpackagedAddonsDirectory "/boot/home/config/non-packaged/add-ons"
+#define kUserNonpackagedBinDirectory 	"/boot/home/config/non-packaged/bin"
+#define kUserNonpackagedLibDirectory 	"/boot/home/config/non-packaged/lib"
+
+
+#endif	// _LIBROOT_DIRECTORIES_H