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

Remove /boot/{apps,preferences} symlinks 

And adjust all remained occurrence in the tree accordingly (->
/boot/common/{apps,preferences}).
This commit is contained in:
Ingo Weinhold 2013-06-04 23:36:46 +02:00
parent 872e7aa2a6
commit a532c57308
14 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/jam/HaikuImage
View File

@ -204,8 +204,6 @@ AddPackageFilesToHaikuImage system : haiku.hpkg ;
AddPackageFilesToHaikuImage system : haiku_loader.hpkg ;
AddSymlinkToHaikuImage . : /boot/common/apps ;
AddSymlinkToHaikuImage . : /boot/common/preferences ;
AddSymlinkToHaikuImage home Desktop : /boot/home : Home ;
# Mailbox folders and symlink

34
build/jam/OptionalPackages
View File

@ -178,7 +178,7 @@ if [ IsOptionalHaikuImagePackageAdded ArmyKnife ] {
InstallOptionalHaikuImagePackage
$(baseURL)/armyknife-63-r1a4-x86-gcc2-2012-08-30.zip ;
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/ArmyKnife/ArmyKnife ;
: /boot/common/apps/ArmyKnife/ArmyKnife ;
}
}
@ -210,7 +210,7 @@ if [ IsOptionalHaikuImagePackageAdded BeAE ] {
$(baseURL)/beae-22-r1a4-x86-gcc2-2012-08-27.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/BeAE/BeAE ;
: /boot/common/apps/BeAE/BeAE ;
}
}
@ -228,7 +228,7 @@ if [ IsOptionalHaikuImagePackageAdded Beam ] {
$(baseURL)/beam-1.2alpha-r1a4-x86-gcc2-2012-08-29.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/Beam/Beam ;
: /boot/common/apps/Beam/Beam ;
}
}
@ -291,7 +291,7 @@ if [ IsOptionalHaikuImagePackageAdded BePDF ] {
$(hpkgBaseURL)/bepdf-1.1.1~beta5_130428-1-x86_gcc2.hpkg ;
}
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/BePDF/BePDF ;
: /boot/common/apps/BePDF/BePDF ;
}
}
@ -309,7 +309,7 @@ if [ IsOptionalHaikuImagePackageAdded BeZillaBrowser ] {
$(hpkgBaseURL)/bezillabrowser-2.0.0.22pre_2010_05_02-1-x86_gcc2.hpkg ;
}
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/BeZillaBrowser/BeZillaBrowser ;
: /boot/common/apps/BeZillaBrowser/BeZillaBrowser ;
}
}
@ -351,7 +351,7 @@ if [ IsOptionalHaikuImagePackageAdded BurnItNow ] {
$(baseURL)/burnitnow-39-r1a4-x86-gcc2-2012-08-27.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/BurnItNow/BurnItNow ;
: /boot/common/apps/BurnItNow/BurnItNow ;
}
}
@ -403,7 +403,7 @@ if [ IsOptionalHaikuImagePackageAdded Caya ] {
$(baseURL)/caya-gpl-protocols-36-r1a4-x86-gcc4-2012-10-01.zip
: : cdPackage ;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Caya/Caya ;
: /boot/common/apps/Caya/Caya ;
} else {
Echo "No optional package Caya available for $(TARGET_ARCH)-gcc2" ;
}
@ -474,7 +474,7 @@ if [ IsOptionalHaikuImagePackageAdded Clockwerk ] {
$(baseURL)/Clockwerk-0.0.2-x86-gcc2-2012-03-04.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/Clockwerk/Clockwerk ;
: /boot/common/apps/Clockwerk/Clockwerk ;
}
}
@ -523,7 +523,7 @@ if [ IsOptionalHaikuImagePackageAdded Colors! ] {
$(baseURL)/Colors\!-2.1-r1a4-x86-gcc2-2012-08-30.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/Colors\!/Colors\! ;
: /boot/common/apps/Colors\!/Colors\! ;
}
}
@ -868,7 +868,7 @@ if [ IsOptionalHaikuImagePackageAdded friss ] {
$(baseURL)/friss-33-r1a4-x86-gcc2-2012-11-06.zip ;
}
# AddSymlinkToHaikuImage home config settings deskbar menu Desktop\ applets
# : /boot/apps/FRiSS/FRiSS ;
# : /boot/common/apps/FRiSS/FRiSS ;
}
}
@ -1389,7 +1389,7 @@ if [ IsOptionalHaikuImagePackageAdded NetSurf ] {
InstallOptionalHaikuImagePackage
$(baseURL)/netsurf-2.7-r1a3-x86-gcc2-2011-06-04.zip ;
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/NetSurf/NetSurf ;
: /boot/common/apps/NetSurf/NetSurf ;
}
}
@ -1502,9 +1502,9 @@ if [ IsOptionalHaikuImagePackageAdded Paladin ] {
}
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/Paladin/Paladin ;
: /boot/common/apps/Paladin/Paladin ;
AddSymlinkToHaikuImage common bin
: /boot/apps/Paladin/Paladin ;
: /boot/common/apps/Paladin/Paladin ;
}
}
@ -1541,7 +1541,7 @@ if [ IsOptionalHaikuImagePackageAdded Pe ] {
$(hpkgBaseURL)/pe-2.4.3_hg602-3-x86_gcc2.hpkg ;
}
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/Pe/Pe ;
: /boot/common/apps/Pe/Pe ;
}
}
@ -1577,7 +1577,7 @@ if [ IsOptionalHaikuImagePackageAdded Puri ] {
InstallOptionalHaikuImagePackage
$(baseURL)/puri-0.3.9.1-x86-gcc4-2012-11-01.zip ;
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/Puri/Puri ;
: /boot/common/apps/Puri/Puri ;
}
}
@ -1889,7 +1889,7 @@ if [ IsOptionalHaikuImagePackageAdded Vision ] {
$(hpkgBaseURL)/vision-908-3-x86_gcc2.hpkg ;
}
AddSymlinkToHaikuImage home config settings deskbar menu Applications
: /boot/apps/Vision/Vision ;
: /boot/common/apps/Vision/Vision ;
}
}
@ -1920,7 +1920,7 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
AddFilesToHaikuHybridImage apps : WebPositive ;
AddSymlinkToHaikuHybridImage
home config settings deskbar menu Applications
: /boot/apps/WebPositive ;
: /boot/common/apps/WebPositive ;
}
}

4
data/system/boot/SetupEnvironment
View File

@ -29,11 +29,11 @@ export BE_HOST_CPU
if [ "$SAFEMODE" != "yes" ]
then
export PATH=.:$HOME/config/non-packaged/bin:$HOME/config/bin:/boot/common/non-packaged/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/system/apps:/boot/system/preferences
export PATH=.:$HOME/config/non-packaged/bin:$HOME/config/bin:/boot/common/non-packaged/bin:/boot/common/bin:/bin:/boot/common/apps:/boot/common/preferences:/boot/system/apps:/boot/system/preferences
export LIBRARY_PATH="%A/lib:$HOME/config/non-packaged/lib:$HOME/config/lib:/boot/common/non-packaged/lib:/boot/common/lib:/boot/system/lib"
export ADDON_PATH="%A/add-ons:$HOME/config/non-packaged/add-ons:$HOME/config/add-ons:/boot/common/non-packaged/add-ons:/boot/common/add-ons:/boot/system/add-ons"
else
export PATH=.:/bin:/boot/apps:/boot/system/apps:/boot/system/preferences
export PATH=.:/bin:/boot/common/apps:/boot/system/apps:/boot/system/preferences
export LIBRARY_PATH="%A/lib:/boot/system/lib"
export ADDON_PATH="%A/add-ons:/boot/system/add-ons"
fi

4
headers/private/system/directories.h
View File

@ -13,8 +13,8 @@
#define kGlobalTempDirectory "/tmp"
#define kGlobalVarDirectory "/var"
#define kAppsDirectory "/boot/apps"
#define kPreferencesDirectory "/boot/preferences"
#define kAppsDirectory "/boot/common/apps"
#define kPreferencesDirectory "/boot/common/preferences"
#define kAppLocalAddonsDirectory "%A/add-ons"
#define kAppLocalLibDirectory "%A/lib"

2
src/add-ons/print/drivers/pdf/doc/Create_Report_Mail.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh
/boot/apps/BeMail mailto:philippe.houdoin@free.fr -subject "pdf_writer v.1.0b1 report" -body "Thanks for taking the time to report how pdf_writer v1.0b1 worked for you!
/boot/common/apps/BeMail mailto:philippe.houdoin@free.fr -subject "pdf_writer v.1.0b1 report" -body "Thanks for taking the time to report how pdf_writer v1.0b1 worked for you!
Please edit the following text to reflect your experience when trying pdf_writer:

2
src/apps/autoraise/AutoRaise.txt
View File

@ -8,7 +8,7 @@ This tiny Deskbar replicant is a window autoraiser. It will bring to front whate
Installation:
- put the AutoRaise folder where you want (I suggest /boot/apps),
- put the AutoRaise folder where you want (I suggest /boot/common/apps),
- you can delete the src/ folder if you aren't interested in the sources,
- double-click on either the 'Put me in Deskbar', or 'Put me in Deskbar (persistant)', the later will keep it in between boots.

6
src/bin/bash/config-top.h
View File

@ -56,9 +56,9 @@
#define DEFAULT_PATH_VALUE \
".:/boot/home/config/non-packaged/bin:/boot/home/config/bin" \
":/boot/common/non-packaged/bin:/boot/common/bin" \
":/bin:/boot/apps:/boot/preferences" \
":/bin:/boot/common/apps:/boot/common/preferences" \
":/boot/system/apps" \
":/boot/system/preferences"
":/boot/system/preferences"
#endif
/* The value for PATH when invoking `command -p'. This is only used when
@ -66,7 +66,7 @@
#ifndef STANDARD_UTILS_PATH
#define STANDARD_UTILS_PATH \
":/boot/common/non-packaged/bin:/boot/common/bin" \
":/bin:/boot/apps:/boot/preferences" \
":/bin:/boot/common/apps:/boot/common/preferences" \
":/boot/system/apps" \
":/boot/system/preferences"
#endif

2
src/kits/tracker/Jamfile
View File

@ -3,7 +3,7 @@ SubDir HAIKU_TOP src kits tracker ;
SetSubDirSupportedPlatformsBeOSCompatible ;
AddSubDirSupportedPlatforms libbe_test ;
UsePrivateHeaders interface mount shared storage support tracker ;
UsePrivateHeaders interface mount shared storage support system tracker ;
AddResources libtracker.so : TrackerIcons.rdef libtracker.rdef ;

11
src/kits/tracker/Tests.cpp
View File

@ -43,6 +43,7 @@ All rights reserved.
#include <String.h>
#include <Window.h>
#include <directories.h>
#include "EntryIterator.h"
#include "IconCache.h"
@ -54,13 +55,9 @@ All rights reserved.
const char* pathsToSearch[] = {
// "/boot/home/config/settings/NetPositive/Bookmarks/",
#ifdef __HAIKU__
"/boot/system",
#else
"/boot/beos",
#endif
"/boot/apps",
"/boot/home",
kSystemDirectory,
kAppsDirectory,
kUserDirectory,
0
};

2
src/libs/expat/xmlwf/xmlwf
View File

@ -18,7 +18,7 @@ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
# if CDPATH is set.
if test "${CDPATH+set}" = set; then CDPATH=:; export CDPATH; fi
relink_command="cd /boot/home/projects/develop/ThirdParty/Haiku/src/libs/expat; LIBRARY_PATH=\"%A/lib:/boot/home/config/lib:/boot/beos/system/lib:/boot/apps/GeekGadgets/lib:/boot/apps/X11R6.4/lib\"; export LIBRARY_PATH; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LIBRARY_PATH=\"%A/lib:/boot/home/config/lib:/boot/beos/system/lib:/boot/apps/GeekGadgets/lib:/boot/apps/X11R6.4/lib\"; export LIBRARY_PATH; PATH=\".:/boot/home/config/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:/boot/develop/tools/gnupro/bin:/boot/apps/GeekGadgets/bin:/boot/apps/X11R6.4/bin\"; export PATH; gcc -g -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions -DHAVE_EXPAT_CONFIG_H -I/boot/home/config/include -I./lib -I. -o \$progdir/\$file xmlwf/xmlwf.o xmlwf/xmlfile.o xmlwf/codepage.o xmlwf/readfilemap.o -L/boot/home/config/lib ./.libs/libexpat.so -Wl,--rpath -Wl,/boot/home/projects/develop/ThirdParty/Haiku/src/libs/expat/.libs -Wl,--rpath -Wl,/boot/home//lib"
relink_command="cd /boot/home/projects/develop/ThirdParty/Haiku/src/libs/expat; LIBRARY_PATH=\"%A/lib:/boot/home/config/lib:/boot/beos/system/lib:/boot/common/apps/GeekGadgets/lib:/boot/common/apps/X11R6.4/lib\"; export LIBRARY_PATH; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LIBRARY_PATH=\"%A/lib:/boot/home/config/lib:/boot/beos/system/lib:/boot/common/apps/GeekGadgets/lib:/boot/common/apps/X11R6.4/lib\"; export LIBRARY_PATH; PATH=\".:/boot/home/config/bin:/bin:/boot/common/apps:/boot/common/preferences:/boot/beos/apps:/boot/beos/preferences:/boot/develop/tools/gnupro/bin:/boot/common/apps/GeekGadgets/bin:/boot/common/apps/X11R6.4/bin\"; export PATH; gcc -g -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions -DHAVE_EXPAT_CONFIG_H -I/boot/home/config/include -I./lib -I. -o \$progdir/\$file xmlwf/xmlwf.o xmlwf/xmlfile.o xmlwf/codepage.o xmlwf/readfilemap.o -L/boot/home/config/lib ./.libs/libexpat.so -Wl,--rpath -Wl,/boot/home/projects/develop/ThirdParty/Haiku/src/libs/expat/.libs -Wl,--rpath -Wl,/boot/home//lib"
# This environment variable determines our operation mode.
if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then

2
src/preferences/printers/doxygen.cfg
View File

@ -580,7 +580,7 @@ ALLEXTERNALS = NO
# The PERL_PATH should be the absolute path and name of the perl script
# interpreter (i.e. the result of `which perl').
PERL_PATH = /boot/apps/GeekGadgets/bin/perl
PERL_PATH = /boot/common/bin/perl
#---------------------------------------------------------------------------
# Configuration options related to the dot tool

2
src/tests/add-ons/kernel/file_systems/fs_shell/fsh.cpp
View File

@ -1309,7 +1309,7 @@ copydir(char *fromPath,char *toPath)
static int
do_copytest(int argc, char **argv)
{
char *fromPath = "/boot/apps/internet/mozilla";
char *fromPath = "/boot/common/apps/internet/mozilla";
if (argc > 2) {
printf("usage: copytest <path>");

2
src/tests/kits/interface/bdeskbar/DeskbarAddItemTest.cpp
View File

@ -19,7 +19,7 @@
const char *appName = "application/x-vnd.jsr-additemtest";
const char *pulsePath = "/boot/apps/Pulse";
const char *pulsePath = "/boot/common/apps/Pulse";
/*

4
src/tests/kits/storage/FindDirectoryTest.cpp
View File

@ -322,10 +322,10 @@ test_find_directory(directory_which dir, BPath &path, dev_t device)
break;
// Global directories.
case B_APPS_DIRECTORY:
error = path.SetTo("/boot/apps");
error = path.SetTo("/boot/common/apps");
break;
case B_PREFERENCES_DIRECTORY:
error = path.SetTo("/boot/preferences");
error = path.SetTo("/boot/common/preferences");
break;
case B_UTILITIES_DIRECTORY:
error = path.SetTo("/boot/utilities");