* Changed directory structure as suggested on the mailing list.

* Made the TimeZoneView less error prone, and also actually use Haiku code (the
  previous check didn't work since it used #if, not #ifdef).
* Also took the liberty to rename our boot loader to haiku_loader, since I had
  to update the nasm binary anyway. Updated the assembly sources to nasm 2.0.
* I haven't found where the synth location in the MIDI code is specified,
  though.
* Also, NetBootArchive, and FloppyBootImage haven't been updated yet. Will do
  so next.
* Some optional packages still put their license to beos/etc/licenses. I didn't
  update them yet, as we'll probably do so anyway at some point. Also, I think
  we might want to introduce a common/data/licenses instead for those.
* If you encounter any problems, please tell!


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29876 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-04-03 09:02:44 +00:00
parent 7a517c04b0
commit 317bd7dda3
38 changed files with 919 additions and 911 deletions
+13 -13
View File
@@ -20,7 +20,7 @@ launch() {
echo There is no "$toLaunch"
fi
return 0
}
}
# launchscript <script path>
@@ -54,13 +54,13 @@ exec </dev/null
exec >/dev/null 2>&1
# Standard locations of boot files
SCRIPTS=beos/system/boot
SERVERS=beos/system/servers
SCRIPTS=system/boot
SERVERS=system/servers
# clean the shared memory dir
shmDir=/boot/var/shared_memory
rm -rf $shmDir
mkdir $shmDir
mkdir -p $shmDir
chmod 777 $shmDir
# Set up the environment
@@ -77,7 +77,7 @@ if [ "$iw" = "yes" ]; then
fi
# Sets timezone etc.
runprog beos/bin/clockconfig
runprog system/bin/clockconfig
# Launch servers
@@ -105,18 +105,18 @@ fi
# Launch Terminal or consoled depending on $SAFEMODE
if [ "$SAFEMODE" != "yes" ]; then
if [ -e /etc/users ]; then
launch beos/system/Login
launch system/Login
# nothing more
else
launch beos/system/Tracker
launch beos/system/Deskbar
launch system/Tracker
launch system/Deskbar
# install ProcessController in the deskbar
(sleep 7; /boot/beos/apps/ProcessController -deskbar) &
(sleep 7; /boot/system/apps/ProcessController -deskbar) &
fi
launch beos/apps/Terminal
launch system/apps/Terminal
else
launch beos/bin/consoled
launch system/bin/consoled
fi
if [ "$SAFEMODE" != "yes" ]; then
@@ -124,7 +124,7 @@ if [ "$SAFEMODE" != "yes" ]; then
launch $SERVERS/midi_server
fi
# Launch Print Server
# Launch Print Server
if [ "$SAFEMODE" != "yes" ]; then
launch $SERVERS/print_server
fi
@@ -135,7 +135,7 @@ if [ "$SAFEMODE" != "yes" ]; then
fi
# Check for daily saving time
launch beos/bin/dstcheck
launch system/bin/dstcheck
if [ "$SAFEMODE" != "yes" ]; then
# Start user boot script
+6 -6
View File
@@ -72,15 +72,15 @@ fi
# Launch Terminal or consoled depending on $SAFEMODE
if [ "$SAFEMODE" != "yes" ]; then
if [ -x /boot/beos/apps/Installer ]; then
/boot/beos/apps/Installer
#/boot/beos/apps/Terminal -x /boot/beos/apps/Installer
if [ -x /boot/system/apps/Installer ]; then
/boot/system/apps/Installer
#/boot/system/apps/Terminal -x /boot/system/apps/Installer
else
/boot/beos/apps/Terminal
/boot/system/apps/Terminal
fi
#launch beos/apps/Terminal
#launch system/apps/Terminal
else
launch beos/bin/consoled
launch system/bin/consoled
fi
# sync disks
+6 -6
View File
@@ -42,13 +42,13 @@ export BE_DEFAULT_CPLUS_FLAGS=""
if [ "$SAFEMODE" != "yes" ]
then
export PATH=.:$HOME/config/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:$BETOOLS
export LIBRARY_PATH="%A/lib:$HOME/config/lib:/boot/common/lib:/boot/beos/system/lib"
export ADDON_PATH="%A/add-ons:$HOME/config/add-ons:/boot/beos/system/add-ons"
export PATH=.:$HOME/config/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/system/apps:/boot/system/preferences:$BETOOLS
export LIBRARY_PATH="%A/lib:$HOME/config/lib:/boot/common/lib:/boot/system/lib"
export ADDON_PATH="%A/add-ons:$HOME/config/add-ons:/boot/system/add-ons"
else
export PATH=.:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:$BETOOLS
export LIBRARY_PATH="%A/lib:/boot/common/lib:/boot/beos/system/lib"
export ADDON_PATH="%A/add-ons:/boot/beos/system/add-ons"
export PATH=.:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/system/apps:/boot/system/preferences:$BETOOLS
export LIBRARY_PATH="%A/lib:/boot/common/lib:/boot/system/lib"
export ADDON_PATH="%A/add-ons:/boot/system/add-ons"
fi
# media kit