From 0491552bc3b8dc166774300c5948ea1cf083430a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 10 Nov 2009 12:30:06 +0000 Subject: [PATCH] * Moved the "fonts" directory into the "data" directory. * Moved fonts to where they belong. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33981 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 6 +++--- data/{etc => system/data}/fonts/psfonts/bchb.afm | 0 data/{etc => system/data}/fonts/psfonts/bchb.pfb | Bin data/{etc => system/data}/fonts/psfonts/bchbi.afm | 0 data/{etc => system/data}/fonts/psfonts/bchbi.pfb | Bin data/{etc => system/data}/fonts/psfonts/bchr.afm | 0 data/{etc => system/data}/fonts/psfonts/bchr.pfb | Bin data/{etc => system/data}/fonts/psfonts/bchri.afm | 0 data/{etc => system/data}/fonts/psfonts/bchri.pfb | Bin data/{etc => system/data}/fonts/psfonts/cour.afm | 0 data/{etc => system/data}/fonts/psfonts/cour.pfa | 0 data/{etc => system/data}/fonts/psfonts/courb.afm | 0 data/{etc => system/data}/fonts/psfonts/courb.pfa | 0 data/{etc => system/data}/fonts/psfonts/courbi.afm | 0 data/{etc => system/data}/fonts/psfonts/courbi.pfa | 0 data/{etc => system/data}/fonts/psfonts/couri.afm | 0 data/{etc => system/data}/fonts/psfonts/couri.pfa | 0 data/{etc => system/data}/fonts/psfonts/cr-pc8.afm | 0 data/{etc => system/data}/fonts/psfonts/crb-pc8.afm | 0 .../{etc => system/data}/fonts/psfonts/crbi-pc8.afm | 0 data/{etc => system/data}/fonts/psfonts/cri-pc8.afm | 0 .../data}/fonts/ttfonts/DejaVuSans-Bold.ttf | Bin .../data}/fonts/ttfonts/DejaVuSans-BoldOblique.ttf | Bin .../data}/fonts/ttfonts/DejaVuSans-ExtraLight.ttf | Bin .../data}/fonts/ttfonts/DejaVuSans-Oblique.ttf | Bin .../data}/fonts/ttfonts/DejaVuSans.ttf | Bin .../fonts/ttfonts/DejaVuSansCondensed-Bold.ttf | Bin .../ttfonts/DejaVuSansCondensed-BoldOblique.ttf | Bin .../fonts/ttfonts/DejaVuSansCondensed-Oblique.ttf | Bin .../data}/fonts/ttfonts/DejaVuSansCondensed.ttf | Bin .../data}/fonts/ttfonts/DejaVuSansMono-Bold.ttf | Bin .../fonts/ttfonts/DejaVuSansMono-BoldOblique.ttf | Bin .../data}/fonts/ttfonts/DejaVuSansMono-Oblique.ttf | Bin .../data}/fonts/ttfonts/DejaVuSansMono.ttf | Bin .../data}/fonts/ttfonts/DejaVuSerif-Bold.ttf | Bin .../data}/fonts/ttfonts/DejaVuSerif-BoldItalic.ttf | Bin .../data}/fonts/ttfonts/DejaVuSerif-Italic.ttf | Bin .../data}/fonts/ttfonts/DejaVuSerif.ttf | Bin .../fonts/ttfonts/DejaVuSerifCondensed-Bold.ttf | Bin .../ttfonts/DejaVuSerifCondensed-BoldItalic.ttf | Bin .../fonts/ttfonts/DejaVuSerifCondensed-Italic.ttf | Bin .../data}/fonts/ttfonts/DejaVuSerifCondensed.ttf | Bin data/{etc => system/data}/fonts/ttfonts/Konatu.ttf | Bin .../data}/fonts/ttfonts/KonatuTohaba.ttf | Bin src/system/libroot/os/find_directory.c | 6 +++--- 45 files changed, 6 insertions(+), 6 deletions(-) rename data/{etc => system/data}/fonts/psfonts/bchb.afm (100%) rename data/{etc => system/data}/fonts/psfonts/bchb.pfb (100%) rename data/{etc => system/data}/fonts/psfonts/bchbi.afm (100%) rename data/{etc => system/data}/fonts/psfonts/bchbi.pfb (100%) rename data/{etc => system/data}/fonts/psfonts/bchr.afm (100%) rename data/{etc => system/data}/fonts/psfonts/bchr.pfb (100%) rename data/{etc => system/data}/fonts/psfonts/bchri.afm (100%) rename data/{etc => system/data}/fonts/psfonts/bchri.pfb (100%) rename data/{etc => system/data}/fonts/psfonts/cour.afm (100%) rename data/{etc => system/data}/fonts/psfonts/cour.pfa (100%) rename data/{etc => system/data}/fonts/psfonts/courb.afm (100%) rename data/{etc => system/data}/fonts/psfonts/courb.pfa (100%) rename data/{etc => system/data}/fonts/psfonts/courbi.afm (100%) rename data/{etc => system/data}/fonts/psfonts/courbi.pfa (100%) rename data/{etc => system/data}/fonts/psfonts/couri.afm (100%) rename data/{etc => system/data}/fonts/psfonts/couri.pfa (100%) rename data/{etc => system/data}/fonts/psfonts/cr-pc8.afm (100%) rename data/{etc => system/data}/fonts/psfonts/crb-pc8.afm (100%) rename data/{etc => system/data}/fonts/psfonts/crbi-pc8.afm (100%) rename data/{etc => system/data}/fonts/psfonts/cri-pc8.afm (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSans-Bold.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSans-BoldOblique.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSans-ExtraLight.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSans-Oblique.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSans.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSansCondensed-Bold.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSansCondensed-BoldOblique.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSansCondensed-Oblique.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSansCondensed.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSansMono-Bold.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSansMono-BoldOblique.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSansMono-Oblique.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSansMono.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSerif-Bold.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSerif-BoldItalic.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSerif-Italic.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSerif.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSerifCondensed-Bold.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSerifCondensed-BoldItalic.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSerifCondensed-Italic.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/DejaVuSerifCondensed.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/Konatu.ttf (100%) rename data/{etc => system/data}/fonts/ttfonts/KonatuTohaba.ttf (100%) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 913ffb495a..c943ffefac 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -414,11 +414,11 @@ fortuneFiles = $(fortuneFiles:G=etc!fortunes) ; SEARCH on $(fortuneFiles) = [ FDirName $(HAIKU_TOP) data etc fortunes ] ; AddFilesToHaikuImage system etc fortunes : $(fortuneFiles) ; -local fontDir = [ FDirName $(HAIKU_TOP) data etc fonts ] ; +local fontDir = [ FDirName $(HAIKU_TOP) data system data fonts ] ; local psFonts = [ Glob $(fontDir)/psfonts : *.afm *.pfb ] ; local ttFonts = [ Glob $(fontDir)/ttfonts : *.ttf ] ; -AddFilesToHaikuImage system fonts psfonts : $(psFonts) ; -AddFilesToHaikuImage system fonts ttfonts : $(ttFonts) ; +AddFilesToHaikuImage system data fonts psfonts : $(psFonts) ; +AddFilesToHaikuImage system data fonts ttfonts : $(ttFonts) ; local cannaDir = [ FDirName $(HAIKU_TOP) data system data Canna ] ; local cannaDefault = [ Glob $(cannaDir)/default : *.canna *.gz ] ; diff --git a/data/etc/fonts/psfonts/bchb.afm b/data/system/data/fonts/psfonts/bchb.afm similarity index 100% rename from data/etc/fonts/psfonts/bchb.afm rename to data/system/data/fonts/psfonts/bchb.afm diff --git a/data/etc/fonts/psfonts/bchb.pfb b/data/system/data/fonts/psfonts/bchb.pfb similarity index 100% rename from data/etc/fonts/psfonts/bchb.pfb rename to data/system/data/fonts/psfonts/bchb.pfb diff --git a/data/etc/fonts/psfonts/bchbi.afm b/data/system/data/fonts/psfonts/bchbi.afm similarity index 100% rename from data/etc/fonts/psfonts/bchbi.afm rename to data/system/data/fonts/psfonts/bchbi.afm diff --git a/data/etc/fonts/psfonts/bchbi.pfb b/data/system/data/fonts/psfonts/bchbi.pfb similarity index 100% rename from data/etc/fonts/psfonts/bchbi.pfb rename to data/system/data/fonts/psfonts/bchbi.pfb diff --git a/data/etc/fonts/psfonts/bchr.afm b/data/system/data/fonts/psfonts/bchr.afm similarity index 100% rename from data/etc/fonts/psfonts/bchr.afm rename to data/system/data/fonts/psfonts/bchr.afm diff --git a/data/etc/fonts/psfonts/bchr.pfb b/data/system/data/fonts/psfonts/bchr.pfb similarity index 100% rename from data/etc/fonts/psfonts/bchr.pfb rename to data/system/data/fonts/psfonts/bchr.pfb diff --git a/data/etc/fonts/psfonts/bchri.afm b/data/system/data/fonts/psfonts/bchri.afm similarity index 100% rename from data/etc/fonts/psfonts/bchri.afm rename to data/system/data/fonts/psfonts/bchri.afm diff --git a/data/etc/fonts/psfonts/bchri.pfb b/data/system/data/fonts/psfonts/bchri.pfb similarity index 100% rename from data/etc/fonts/psfonts/bchri.pfb rename to data/system/data/fonts/psfonts/bchri.pfb diff --git a/data/etc/fonts/psfonts/cour.afm b/data/system/data/fonts/psfonts/cour.afm similarity index 100% rename from data/etc/fonts/psfonts/cour.afm rename to data/system/data/fonts/psfonts/cour.afm diff --git a/data/etc/fonts/psfonts/cour.pfa b/data/system/data/fonts/psfonts/cour.pfa similarity index 100% rename from data/etc/fonts/psfonts/cour.pfa rename to data/system/data/fonts/psfonts/cour.pfa diff --git a/data/etc/fonts/psfonts/courb.afm b/data/system/data/fonts/psfonts/courb.afm similarity index 100% rename from data/etc/fonts/psfonts/courb.afm rename to data/system/data/fonts/psfonts/courb.afm diff --git a/data/etc/fonts/psfonts/courb.pfa b/data/system/data/fonts/psfonts/courb.pfa similarity index 100% rename from data/etc/fonts/psfonts/courb.pfa rename to data/system/data/fonts/psfonts/courb.pfa diff --git a/data/etc/fonts/psfonts/courbi.afm b/data/system/data/fonts/psfonts/courbi.afm similarity index 100% rename from data/etc/fonts/psfonts/courbi.afm rename to data/system/data/fonts/psfonts/courbi.afm diff --git a/data/etc/fonts/psfonts/courbi.pfa b/data/system/data/fonts/psfonts/courbi.pfa similarity index 100% rename from data/etc/fonts/psfonts/courbi.pfa rename to data/system/data/fonts/psfonts/courbi.pfa diff --git a/data/etc/fonts/psfonts/couri.afm b/data/system/data/fonts/psfonts/couri.afm similarity index 100% rename from data/etc/fonts/psfonts/couri.afm rename to data/system/data/fonts/psfonts/couri.afm diff --git a/data/etc/fonts/psfonts/couri.pfa b/data/system/data/fonts/psfonts/couri.pfa similarity index 100% rename from data/etc/fonts/psfonts/couri.pfa rename to data/system/data/fonts/psfonts/couri.pfa diff --git a/data/etc/fonts/psfonts/cr-pc8.afm b/data/system/data/fonts/psfonts/cr-pc8.afm similarity index 100% rename from data/etc/fonts/psfonts/cr-pc8.afm rename to data/system/data/fonts/psfonts/cr-pc8.afm diff --git a/data/etc/fonts/psfonts/crb-pc8.afm b/data/system/data/fonts/psfonts/crb-pc8.afm similarity index 100% rename from data/etc/fonts/psfonts/crb-pc8.afm rename to data/system/data/fonts/psfonts/crb-pc8.afm diff --git a/data/etc/fonts/psfonts/crbi-pc8.afm b/data/system/data/fonts/psfonts/crbi-pc8.afm similarity index 100% rename from data/etc/fonts/psfonts/crbi-pc8.afm rename to data/system/data/fonts/psfonts/crbi-pc8.afm diff --git a/data/etc/fonts/psfonts/cri-pc8.afm b/data/system/data/fonts/psfonts/cri-pc8.afm similarity index 100% rename from data/etc/fonts/psfonts/cri-pc8.afm rename to data/system/data/fonts/psfonts/cri-pc8.afm diff --git a/data/etc/fonts/ttfonts/DejaVuSans-Bold.ttf b/data/system/data/fonts/ttfonts/DejaVuSans-Bold.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSans-Bold.ttf rename to data/system/data/fonts/ttfonts/DejaVuSans-Bold.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSans-BoldOblique.ttf b/data/system/data/fonts/ttfonts/DejaVuSans-BoldOblique.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSans-BoldOblique.ttf rename to data/system/data/fonts/ttfonts/DejaVuSans-BoldOblique.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSans-ExtraLight.ttf b/data/system/data/fonts/ttfonts/DejaVuSans-ExtraLight.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSans-ExtraLight.ttf rename to data/system/data/fonts/ttfonts/DejaVuSans-ExtraLight.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSans-Oblique.ttf b/data/system/data/fonts/ttfonts/DejaVuSans-Oblique.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSans-Oblique.ttf rename to data/system/data/fonts/ttfonts/DejaVuSans-Oblique.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSans.ttf b/data/system/data/fonts/ttfonts/DejaVuSans.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSans.ttf rename to data/system/data/fonts/ttfonts/DejaVuSans.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSansCondensed-Bold.ttf b/data/system/data/fonts/ttfonts/DejaVuSansCondensed-Bold.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSansCondensed-Bold.ttf rename to data/system/data/fonts/ttfonts/DejaVuSansCondensed-Bold.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSansCondensed-BoldOblique.ttf b/data/system/data/fonts/ttfonts/DejaVuSansCondensed-BoldOblique.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSansCondensed-BoldOblique.ttf rename to data/system/data/fonts/ttfonts/DejaVuSansCondensed-BoldOblique.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSansCondensed-Oblique.ttf b/data/system/data/fonts/ttfonts/DejaVuSansCondensed-Oblique.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSansCondensed-Oblique.ttf rename to data/system/data/fonts/ttfonts/DejaVuSansCondensed-Oblique.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSansCondensed.ttf b/data/system/data/fonts/ttfonts/DejaVuSansCondensed.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSansCondensed.ttf rename to data/system/data/fonts/ttfonts/DejaVuSansCondensed.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSansMono-Bold.ttf b/data/system/data/fonts/ttfonts/DejaVuSansMono-Bold.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSansMono-Bold.ttf rename to data/system/data/fonts/ttfonts/DejaVuSansMono-Bold.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSansMono-BoldOblique.ttf b/data/system/data/fonts/ttfonts/DejaVuSansMono-BoldOblique.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSansMono-BoldOblique.ttf rename to data/system/data/fonts/ttfonts/DejaVuSansMono-BoldOblique.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSansMono-Oblique.ttf b/data/system/data/fonts/ttfonts/DejaVuSansMono-Oblique.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSansMono-Oblique.ttf rename to data/system/data/fonts/ttfonts/DejaVuSansMono-Oblique.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSansMono.ttf b/data/system/data/fonts/ttfonts/DejaVuSansMono.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSansMono.ttf rename to data/system/data/fonts/ttfonts/DejaVuSansMono.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSerif-Bold.ttf b/data/system/data/fonts/ttfonts/DejaVuSerif-Bold.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSerif-Bold.ttf rename to data/system/data/fonts/ttfonts/DejaVuSerif-Bold.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSerif-BoldItalic.ttf b/data/system/data/fonts/ttfonts/DejaVuSerif-BoldItalic.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSerif-BoldItalic.ttf rename to data/system/data/fonts/ttfonts/DejaVuSerif-BoldItalic.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSerif-Italic.ttf b/data/system/data/fonts/ttfonts/DejaVuSerif-Italic.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSerif-Italic.ttf rename to data/system/data/fonts/ttfonts/DejaVuSerif-Italic.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSerif.ttf b/data/system/data/fonts/ttfonts/DejaVuSerif.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSerif.ttf rename to data/system/data/fonts/ttfonts/DejaVuSerif.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSerifCondensed-Bold.ttf b/data/system/data/fonts/ttfonts/DejaVuSerifCondensed-Bold.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSerifCondensed-Bold.ttf rename to data/system/data/fonts/ttfonts/DejaVuSerifCondensed-Bold.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSerifCondensed-BoldItalic.ttf b/data/system/data/fonts/ttfonts/DejaVuSerifCondensed-BoldItalic.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSerifCondensed-BoldItalic.ttf rename to data/system/data/fonts/ttfonts/DejaVuSerifCondensed-BoldItalic.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSerifCondensed-Italic.ttf b/data/system/data/fonts/ttfonts/DejaVuSerifCondensed-Italic.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSerifCondensed-Italic.ttf rename to data/system/data/fonts/ttfonts/DejaVuSerifCondensed-Italic.ttf diff --git a/data/etc/fonts/ttfonts/DejaVuSerifCondensed.ttf b/data/system/data/fonts/ttfonts/DejaVuSerifCondensed.ttf similarity index 100% rename from data/etc/fonts/ttfonts/DejaVuSerifCondensed.ttf rename to data/system/data/fonts/ttfonts/DejaVuSerifCondensed.ttf diff --git a/data/etc/fonts/ttfonts/Konatu.ttf b/data/system/data/fonts/ttfonts/Konatu.ttf similarity index 100% rename from data/etc/fonts/ttfonts/Konatu.ttf rename to data/system/data/fonts/ttfonts/Konatu.ttf diff --git a/data/etc/fonts/ttfonts/KonatuTohaba.ttf b/data/system/data/fonts/ttfonts/KonatuTohaba.ttf similarity index 100% rename from data/etc/fonts/ttfonts/KonatuTohaba.ttf rename to data/system/data/fonts/ttfonts/KonatuTohaba.ttf diff --git a/src/system/libroot/os/find_directory.c b/src/system/libroot/os/find_directory.c index 169de72e09..21f9685e0a 100644 --- a/src/system/libroot/os/find_directory.c +++ b/src/system/libroot/os/find_directory.c @@ -39,7 +39,7 @@ static const char *kSystemDirectories[] = { SYSTEM, // B_BEOS_SYSTEM_DIRECTORY SYSTEM "/add-ons", SYSTEM "/boot", - SYSTEM "/fonts", + SYSTEM "/data/fonts", SYSTEM "/lib", SYSTEM "/servers", SYSTEM "/apps", @@ -64,7 +64,7 @@ static const char *kCommonDirectories[] = { COMMON "", // B_COMMON_SYSTEM_DIRECTORY COMMON "/add-ons", COMMON "/boot", - COMMON "/fonts", + COMMON "/data/fonts", COMMON "/lib", COMMON "/servers", COMMON "/bin", @@ -91,7 +91,7 @@ static const char *kUserDirectories[] = { HOME "/config", // B_USER_CONFIG_DIRECTORY HOME "/config/add-ons", HOME "/config/boot", - HOME "/config/fonts", + HOME "/config/data/fonts", HOME "/config/lib", HOME "/config/settings", HOME "/config/be",