Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move deskbar menu directory to ~/config/settings/deskbar/menu

Browse Source 
Also remove the "be" symlink in ~/config/settings.
This commit is contained in:
Ingo Weinhold 2013-05-11 09:56:47 +02:00
parent a085e81e62
commit 0bfcf7312a
3 changed files with 35 additions and 35 deletions
build/jam
HaikuImageOptionalPackages
src/system/libroot/os
find_directory.cpp

17
build/jam/HaikuImage

@ -209,8 +209,7 @@ AddDirectoryToHaikuImage home mail out ;
AddDirectoryToHaikuImage home config settings global ;
# Deskbar Application links
AddSymlinkToHaikuImage home config settings : deskbar : be ;
AddDirectoryToHaikuImage home config settings deskbar Applications ;
AddDirectoryToHaikuImage home config settings deskbar menu Applications ;
DESKBAR_APPLICATIONS = ActivityMonitor CharacterMap CodyCam CDPlayer DeskCalc
Devices DiskProbe DriveSetup DiskUsage Expander Icon-O-Matic Installer
Magnify Mail MediaConverter MediaPlayer MidiPlayer People PoorMan
@ -218,33 +217,33 @@ DESKBAR_APPLICATIONS = ActivityMonitor CharacterMap CodyCam CDPlayer DeskCalc
;
local linkTarget ;
for linkTarget in $(DESKBAR_APPLICATIONS) {
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/system/apps/$(linkTarget) : $(linkTarget) ;
}
# Deskbar Desktop applets links
AddDirectoryToHaikuImage home config settings deskbar Desktop\ applets ;
AddDirectoryToHaikuImage home config settings deskbar menu Desktop\ applets ;
DESKBAR_DESKTOP_APPLETS = LaunchBox NetworkStatus PowerStatus ProcessController
Workspaces
;
for linkTarget in $(DESKBAR_DESKTOP_APPLETS) {
AddSymlinkToHaikuImage home config settings deskbar Desktop\ applets
AddSymlinkToHaikuImage home config settings deskbar menu Desktop\ applets
: /boot/system/apps/$(linkTarget) : $(linkTarget) ;
}
# Deskbar Preferences links
AddDirectoryToHaikuImage home config settings deskbar Preferences ;
AddDirectoryToHaikuImage home config settings deskbar menu Preferences ;
DESKBAR_PREFERENCES = $(SYSTEM_PREFERENCES:B) ;
for linkTarget in $(DESKBAR_PREFERENCES) {
AddSymlinkToHaikuImage home config settings deskbar Preferences
AddSymlinkToHaikuImage home config settings deskbar menu Preferences
: /boot/system/preferences/$(linkTarget)
: $(linkTarget) ;
}
# Deskbar Demo links
AddDirectoryToHaikuImage home config settings deskbar Demos ;
AddDirectoryToHaikuImage home config settings deskbar menu Demos ;
for linkTarget in $(SYSTEM_DEMOS) {
AddSymlinkToHaikuImage home config settings deskbar Demos
AddSymlinkToHaikuImage home config settings deskbar menu Demos
: /boot/system/demos/$(linkTarget) : $(linkTarget) ;
}

51
build/jam/OptionalPackages

@ -177,7 +177,7 @@ if [ IsOptionalHaikuImagePackageAdded ArmyKnife ] {
} else {
InstallOptionalHaikuImagePackage
$(baseURL)/armyknife-63-r1a4-x86-gcc2-2012-08-30.zip ;
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/ArmyKnife/ArmyKnife ;
}
}
@ -209,7 +209,7 @@ if [ IsOptionalHaikuImagePackageAdded BeAE ] {
InstallOptionalHaikuImagePackage
$(baseURL)/beae-22-r1a4-x86-gcc2-2012-08-27.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/BeAE/BeAE ;
}
}
@ -227,7 +227,7 @@ if [ IsOptionalHaikuImagePackageAdded Beam ] {
InstallOptionalHaikuImagePackage
$(baseURL)/beam-1.2alpha-r1a4-x86-gcc2-2012-08-29.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/Beam/Beam ;
}
}
@ -290,7 +290,7 @@ if [ IsOptionalHaikuImagePackageAdded BePDF ] {
InstallOptionalHaikuImagePackage
$(hpkgBaseURL)/bepdf-1.1.1~beta5_130428-1-x86_gcc2.hpkg ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/BePDF/BePDF ;
}
}
@ -308,7 +308,7 @@ if [ IsOptionalHaikuImagePackageAdded BeZillaBrowser ] {
InstallOptionalHaikuImagePackage
$(hpkgBaseURL)/bezillabrowser-2.0.0.22pre_2010_05_02-1-x86_gcc2.hpkg ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/BeZillaBrowser/BeZillaBrowser ;
}
}
@ -326,7 +326,7 @@ if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
: btCoreData hci ;
AddFilesToHaikuImage system preferences : Bluetooth ;
AddFilesToHaikuImage system bin : bt_dev_info bt_discovery ;
AddSymlinkToHaikuImage home config settings deskbar Preferences
AddSymlinkToHaikuImage home config settings deskbar menu Preferences
: /boot/system/preferences/Bluetooth ;
if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ]
&& $(HAIKU_GCC_VERSION[1]) in 2 4 {
@ -350,7 +350,7 @@ if [ IsOptionalHaikuImagePackageAdded BurnItNow ] {
InstallOptionalHaikuImagePackage
$(baseURL)/burnitnow-39-r1a4-x86-gcc2-2012-08-27.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/BurnItNow/BurnItNow ;
}
}
@ -473,7 +473,7 @@ if [ IsOptionalHaikuImagePackageAdded Clockwerk ] {
InstallOptionalHaikuImagePackage
$(baseURL)/Clockwerk-0.0.2-x86-gcc2-2012-03-04.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/Clockwerk/Clockwerk ;
}
}
@ -522,7 +522,7 @@ if [ IsOptionalHaikuImagePackageAdded Colors! ] {
InstallOptionalHaikuImagePackage
$(baseURL)/Colors\!-2.1-r1a4-x86-gcc2-2012-08-30.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/Colors\!/Colors\! ;
}
}
@ -620,7 +620,7 @@ if [ IsOptionalHaikuImagePackageAdded DemoPackage_Video ] {
# Development
if [ IsOptionalHaikuImagePackageAdded Development ] {
if $(TARGET_ARCH) = x86 {
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/system/apps/Debugger : Debugger ;
# autotools
if $(HAIKU_GCC_VERSION[1]) >= 4 {
@ -647,7 +647,7 @@ if [ IsOptionalHaikuImagePackageAdded Development ] {
$(hpkgBaseURL)/texinfo-4.13a-6-x86_gcc2.hpkg ;
}
} else if $(TARGET_ARCH) = x86_64 {
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/system/apps/Debugger : Debugger ;
InstallOptionalHaikuImagePackage
$(baseURL)/autoconf-2.69-x86_64-2013-02-16.zip
@ -867,7 +867,7 @@ if [ IsOptionalHaikuImagePackageAdded friss ] {
InstallOptionalHaikuImagePackage
$(baseURL)/friss-33-r1a4-x86-gcc2-2012-11-06.zip ;
}
# AddSymlinkToHaikuImage home config settings deskbar Desktop\ applets
# AddSymlinkToHaikuImage home config settings deskbar menu Desktop\ applets
# : /boot/apps/FRiSS/FRiSS ;
}
}
@ -1056,13 +1056,13 @@ if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
InstallOptionalHaikuImagePackage
$(hpkgBaseURL)/keymapswitcher-1.2.7.9-2-x86_gcc2.hpkg ;
}
AddSymlinkToHaikuImage home config settings deskbar Preferences
AddSymlinkToHaikuImage home config settings deskbar menu Preferences
: /boot/common/bin/KeymapSwitcher ;
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage
$(baseURL)/KeymapSwitcher-1.2.7-x86_64-2013-01-08.zip
: : cdPackage ;
AddSymlinkToHaikuImage home config settings deskbar Preferences
AddSymlinkToHaikuImage home config settings deskbar menu Preferences
: /boot/common/bin/KeymapSwitcher ;
} else {
Echo "No optional package KeymapSwitcher available for $(TARGET_ARCH)" ;
@ -1218,12 +1218,12 @@ if [ IsOptionalHaikuImagePackageAdded Links ] {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
$(baseURL)/links-2.3pre2-r1a4-x86-gcc4-2012-09-09.zip ;
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/home/config/bin/links ;
} else {
InstallOptionalHaikuImagePackage
$(baseURL)/links-2.3pre2-r1a4-x86-gcc2-2012-08-30.zip ;
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/home/config/bin/links ;
}
}
@ -1388,7 +1388,7 @@ if [ IsOptionalHaikuImagePackageAdded NetSurf ] {
} else {
InstallOptionalHaikuImagePackage
$(baseURL)/netsurf-2.7-r1a3-x86-gcc2-2011-06-04.zip ;
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/NetSurf/NetSurf ;
}
}
@ -1501,7 +1501,7 @@ if [ IsOptionalHaikuImagePackageAdded Paladin ] {
$(baseURL)/paladin-1.3-r1a3-x86-gcc2-2011-05-18.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/Paladin/Paladin ;
AddSymlinkToHaikuImage common bin
: /boot/apps/Paladin/Paladin ;
@ -1540,7 +1540,7 @@ if [ IsOptionalHaikuImagePackageAdded Pe ] {
InstallOptionalHaikuImagePackage
$(hpkgBaseURL)/pe-2.4.3_hg602-3-x86_gcc2.hpkg ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/Pe/Pe ;
}
}
@ -1576,7 +1576,7 @@ if [ IsOptionalHaikuImagePackageAdded Puri ] {
} else {
InstallOptionalHaikuImagePackage
$(baseURL)/puri-0.3.9.1-x86-gcc4-2012-11-01.zip ;
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/Puri/Puri ;
}
}
@ -1862,13 +1862,13 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] {
$(baseURL)/vim-7.3-r1a4-x86-gcc2-2012-09-26.zip
: : cdPackage ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/common/bin/gvim ;
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage
$(baseURL)/vim-7.3-x86_64-2013-01-19.zip
: : cdPackage ;
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/common/bin/gvim ;
} else {
Echo "No optional package Vim available for $(TARGET_ARCH)" ;
@ -1888,7 +1888,7 @@ if [ IsOptionalHaikuImagePackageAdded Vision ] {
InstallOptionalHaikuImagePackage
$(hpkgBaseURL)/vision-908-3-x86_gcc2.hpkg ;
}
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/Vision/Vision ;
}
}
@ -1918,7 +1918,8 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
# TODO: Either we build a separate package for WebPositive or we
# incorporate it in haiku.hpkg.
AddFilesToHaikuHybridImage apps : WebPositive ;
AddSymlinkToHaikuHybridImage home config settings deskbar Applications
AddSymlinkToHaikuHybridImage
home config settings deskbar menu Applications
: /boot/apps/WebPositive ;
}
}
@ -2003,7 +2004,7 @@ if [ IsOptionalHaikuImagePackageAdded WonderBrush ] {
} else {
InstallOptionalHaikuImagePackage
$(hpkgBaseURL)/wonderbrush-2.1.2-1-x86_gcc2.hpkg ;
AddSymlinkToHaikuImage home config settings deskbar Applications
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/common/apps/WonderBrush/WonderBrush ;
}
}

2
src/system/libroot/os/find_directory.cpp

@ -120,7 +120,7 @@ static const char *kUserDirectories[] = {
HOME CONFIG "/data/fonts",
HOME CONFIG "/lib",
HOME CONFIG "/settings",
HOME CONFIG "/settings/deskbar",
HOME CONFIG "/settings/deskbar/menu",
HOME CONFIG "/settings/printers",
HOME CONFIG "/add-ons/Translators",
HOME CONFIG "/add-ons/media",