[haiku-commits] r33986 - in haiku/trunk: build/jam headers/os/storage src/bin src/system/kernel/fs src/system/libroot/os
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 10 Nov 2009 15:26:42 +0100 (CET)
Author: axeld
Date: 2009-11-10 15:26:42 +0100 (Tue, 10 Nov 2009)
New Revision: 33986
Changeset: http://dev.haiku-os.org/changeset/33986/haiku
Modified:
haiku/trunk/build/jam/HaikuImage
haiku/trunk/build/jam/ImageRules
haiku/trunk/build/jam/OptionalPackages
haiku/trunk/headers/os/storage/FindDirectory.h
haiku/trunk/src/bin/finddir.c
haiku/trunk/src/system/kernel/fs/vfs_boot.cpp
haiku/trunk/src/system/libroot/os/find_directory.c
Log:
* Removed /system/etc directory.
* /etc now points to /boot/common/etc/, and the remaining contents of the former
"etc" are put there now, as well.
Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage 2009-11-10 14:21:27 UTC (rev 33985)
+++ haiku/trunk/build/jam/HaikuImage 2009-11-10 14:26:42 UTC (rev 33986)
@@ -381,7 +381,7 @@
spellFiles = $(spellFiles:G=spell) ;
SEARCH on $(spellFiles)
= [ FDirName $(HAIKU_TOP) src apps mail ] ;
-AddFilesToHaikuImage system etc word_dictionary : $(spellFiles) ;
+AddFilesToHaikuImage common etc word_dictionary : $(spellFiles) ;
# Locale kit language files
local languageDir = [ FDirName $(HAIKU_TOP) src data locale languages ] ;
@@ -392,14 +392,14 @@
etcFiles = $(etcFiles:G=etc) ;
SEARCH on $(etcFiles) = [ FDirName $(HAIKU_TOP) data etc ] ;
etcFiles += <etc>termcap <etc>sysless <etc>sysless.in ;
-AddFilesToHaikuImage system etc : $(etcFiles) ;
+AddFilesToHaikuImage common etc : $(etcFiles) ;
SEARCH on <bash_completion>subversion =
[ FDirName $(HAIKU_TOP) data etc bash_completion.d ] ;
-AddFilesToHaikuImage system etc bash_completion.d :
<bash_completion>subversion ;
+AddFilesToHaikuImage common etc bash_completion.d :
<bash_completion>subversion ;
SEARCH on <etc>vimrc = [ FDirName $(HAIKU_TOP) data etc vim ] ;
-AddFilesToHaikuImage system etc vim : <etc>vimrc ;
+AddFilesToHaikuImage common etc vim : <etc>vimrc ;
local dataFiles = teapot.data ;
dataFiles = $(dataFiles:G=data) ;
Modified: haiku/trunk/build/jam/ImageRules
===================================================================
--- haiku/trunk/build/jam/ImageRules 2009-11-10 14:21:27 UTC (rev 33985)
+++ haiku/trunk/build/jam/ImageRules 2009-11-10 14:26:42 UTC (rev 33986)
@@ -784,7 +784,7 @@
Always $(file) ;
MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
BuildHaikuImageUserGroupFile $(file) ;
- AddFilesToHaikuImage system etc : $(file) ;
+ AddFilesToHaikuImage common etc : $(file) ;
}
HAIKU_IMAGE_USER_GROUP_ENTRIES on $(file) = $(allEntries) ;
Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages 2009-11-10 14:21:27 UTC (rev
33985)
+++ haiku/trunk/build/jam/OptionalPackages 2009-11-10 14:26:42 UTC (rev
33986)
@@ -148,7 +148,7 @@
AddSymlinkToHaikuImage beos : ../system/apps ;
AddSymlinkToHaikuImage beos : ../system/bin ;
AddSymlinkToHaikuImage beos : ../system/documentation ;
- AddSymlinkToHaikuImage beos : ../system/etc ;
+ AddSymlinkToHaikuImage beos : ../common/etc ;
AddSymlinkToHaikuImage beos : ../system/preferences ;
AddSymlinkToHaikuImage beos : ../system ;
}
Modified: haiku/trunk/headers/os/storage/FindDirectory.h
===================================================================
--- haiku/trunk/headers/os/storage/FindDirectory.h 2009-11-10 14:21:27 UTC
(rev 33985)
+++ haiku/trunk/headers/os/storage/FindDirectory.h 2009-11-10 14:26:42 UTC
(rev 33986)
@@ -11,20 +11,19 @@
typedef enum {
/* Per volume directories */
- B_DESKTOP_DIRECTORY = 0,
+ B_DESKTOP_DIRECTORY = 0,
B_TRASH_DIRECTORY,
/* System directories */
- B_SYSTEM_DIRECTORY = 1000,
- B_SYSTEM_ADDONS_DIRECTORY = 1002,
+ B_SYSTEM_DIRECTORY = 1000,
+ B_SYSTEM_ADDONS_DIRECTORY = 1002,
B_SYSTEM_BOOT_DIRECTORY,
B_SYSTEM_FONTS_DIRECTORY,
B_SYSTEM_LIB_DIRECTORY,
B_SYSTEM_SERVERS_DIRECTORY,
B_SYSTEM_APPS_DIRECTORY,
B_SYSTEM_BIN_DIRECTORY,
- B_SYSTEM_ETC_DIRECTORY,
- B_SYSTEM_DOCUMENTATION_DIRECTORY,
+ B_SYSTEM_DOCUMENTATION_DIRECTORY = 1010,
B_SYSTEM_PREFERENCES_DIRECTORY,
B_SYSTEM_TRANSLATORS_DIRECTORY,
B_SYSTEM_MEDIA_NODES_DIRECTORY,
@@ -32,7 +31,7 @@
B_SYSTEM_DATA_DIRECTORY,
/* Common directories, shared among all users. */
- B_COMMON_DIRECTORY = 2000,
+ B_COMMON_DIRECTORY = 2000,
B_COMMON_SYSTEM_DIRECTORY,
B_COMMON_ADDONS_DIRECTORY,
B_COMMON_BOOT_DIRECTORY,
@@ -55,7 +54,7 @@
/* User directories. These are interpreted in the context
of the user making the find_directory call. */
- B_USER_DIRECTORY = 3000,
+ B_USER_DIRECTORY = 3000,
B_USER_CONFIG_DIRECTORY,
B_USER_ADDONS_DIRECTORY,
B_USER_BOOT_DIRECTORY,
@@ -71,12 +70,12 @@
B_USER_CACHE_DIRECTORY,
/* Global directories. */
- B_APPS_DIRECTORY = 4000,
+ B_APPS_DIRECTORY = 4000,
B_PREFERENCES_DIRECTORY,
B_UTILITIES_DIRECTORY,
/* Obsolete: Legacy BeOS definition to be phased out */
- B_BEOS_DIRECTORY = 1000,
+ B_BEOS_DIRECTORY = 1000,
B_BEOS_SYSTEM_DIRECTORY,
B_BEOS_ADDONS_DIRECTORY,
B_BEOS_BOOT_DIRECTORY,
Modified: haiku/trunk/src/bin/finddir.c
===================================================================
--- haiku/trunk/src/bin/finddir.c 2009-11-10 14:21:27 UTC (rev 33985)
+++ haiku/trunk/src/bin/finddir.c 2009-11-10 14:26:42 UTC (rev 33986)
@@ -40,7 +40,6 @@
KEYVALUE_PAIR(B_SYSTEM_SERVERS_DIRECTORY),
KEYVALUE_PAIR(B_SYSTEM_APPS_DIRECTORY),
KEYVALUE_PAIR(B_SYSTEM_BIN_DIRECTORY),
- KEYVALUE_PAIR(B_SYSTEM_ETC_DIRECTORY),
KEYVALUE_PAIR(B_SYSTEM_DOCUMENTATION_DIRECTORY),
KEYVALUE_PAIR(B_SYSTEM_PREFERENCES_DIRECTORY),
KEYVALUE_PAIR(B_SYSTEM_TRANSLATORS_DIRECTORY),
Modified: haiku/trunk/src/system/kernel/fs/vfs_boot.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/vfs_boot.cpp 2009-11-10 14:21:27 UTC
(rev 33985)
+++ haiku/trunk/src/system/kernel/fs/vfs_boot.cpp 2009-11-10 14:26:42 UTC
(rev 33986)
@@ -1,6 +1,6 @@
/*
* Copyright 2007, Ingo Weinhold, bonefish@xxxxxxxxxxxxxxxx
- * Copyright 2002-2007, Axel Dörfler, axeld@xxxxxxxxxxxxxxxxx
+ * Copyright 2002-2009, Axel Dörfler, axeld@xxxxxxxxxxxxxxxxx
* Distributed under the terms of the MIT License.
*
* Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@@ -47,7 +47,7 @@
} sPredefinedLinks[] = {
{"/system", "/boot/system"},
{"/bin", "/boot/system/bin"},
- {"/etc", "/boot/system/etc"},
+ {"/etc", "/boot/common/etc"},
{"/var", "/boot/var"},
{"/tmp", "/boot/var/tmp"},
{NULL}
Modified: haiku/trunk/src/system/libroot/os/find_directory.c
===================================================================
--- haiku/trunk/src/system/libroot/os/find_directory.c 2009-11-10 14:21:27 UTC
(rev 33985)
+++ haiku/trunk/src/system/libroot/os/find_directory.c 2009-11-10 14:26:42 UTC
(rev 33986)
@@ -44,7 +44,7 @@
SYSTEM "/servers",
SYSTEM "/apps",
SYSTEM "/bin",
- SYSTEM "/etc",
+ "common/etc",
SYSTEM "/documentation",
SYSTEM "/preferences",
SYSTEM "/add-ons/Translators",
@@ -216,7 +216,7 @@
case B_SYSTEM_SERVERS_DIRECTORY:
case B_SYSTEM_APPS_DIRECTORY:
case B_SYSTEM_BIN_DIRECTORY:
- case B_SYSTEM_ETC_DIRECTORY:
+ case B_BEOS_ETC_DIRECTORY:
case B_SYSTEM_DOCUMENTATION_DIRECTORY:
case B_SYSTEM_PREFERENCES_DIRECTORY:
case B_SYSTEM_TRANSLATORS_DIRECTORY:
Other related posts:
- » [haiku-commits] r33986 - in haiku/trunk: build/jam headers/os/storage src/bin src/system/kernel/fs src/system/libroot/os - axeld
