The fake_app_server is now installed and launched by default, so that
RUN_WITHOUT_APP_SERVER is no longer needed. This reduces the hassle when switching between the real app_server and consoled. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12256 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -65,6 +65,7 @@ runprog beos/bin/clockconfig
|
|||||||
# Launch servers
|
# Launch servers
|
||||||
|
|
||||||
# We must wait for the app_server and registrar to be ready
|
# We must wait for the app_server and registrar to be ready
|
||||||
|
launch $SERVERS/fake_app_server picasso
|
||||||
#launch $SERVERS/app_server picasso # launch app_server
|
#launch $SERVERS/app_server picasso # launch app_server
|
||||||
launch $SERVERS/registrar _roster_thread_ # launch registrar
|
launch $SERVERS/registrar _roster_thread_ # launch registrar
|
||||||
launch $SERVERS/debug_server # launch debug_server
|
launch $SERVERS/debug_server # launch debug_server
|
||||||
|
|||||||
+1
-5
@@ -97,10 +97,6 @@ resattr=$sourceDir/objects/${arch}.R1/tools/resattr/resattr
|
|||||||
fsShellCommand=$sourceDir/objects/${arch}.R1/tests/add-ons/kernel/file_systems/fs_shell/fs_shell_command
|
fsShellCommand=$sourceDir/objects/${arch}.R1/tests/add-ons/kernel/file_systems/fs_shell/fs_shell_command
|
||||||
bfsShell=$sourceDir/objects/${arch}.R1/tests/add-ons/kernel/file_systems/bfs/bfs_shell/bfs_shell
|
bfsShell=$sourceDir/objects/${arch}.R1/tests/add-ons/kernel/file_systems/bfs/bfs_shell/bfs_shell
|
||||||
|
|
||||||
if [ x$RUN_WITHOUT_APP_SERVER = x ]; then
|
|
||||||
# define only, if not already set
|
|
||||||
export RUN_WITHOUT_APP_SERVER=1
|
|
||||||
fi
|
|
||||||
export TARGET_PLATFORM=haiku
|
export TARGET_PLATFORM=haiku
|
||||||
|
|
||||||
BEOS_BIN="touch sync ln listarea listattr listsem listport \
|
BEOS_BIN="touch sync ln listarea listattr listsem listport \
|
||||||
@@ -119,7 +115,7 @@ BEOS_SYSTEM_LIB="libbe.so libstdc++.r4.so libnet.so libmedia.so \
|
|||||||
libtextencoding.so libz.so libfreetype.so libpng.so libappserver.so"
|
libtextencoding.so libz.so libfreetype.so libpng.so libappserver.so"
|
||||||
|
|
||||||
BEOS_SYSTEM_SERVERS="registrar debug_server syslog_daemon media_server \
|
BEOS_SYSTEM_SERVERS="registrar debug_server syslog_daemon media_server \
|
||||||
media_addon_server input_server app_server"
|
media_addon_server input_server app_server fake_app_server"
|
||||||
|
|
||||||
BEOS_ADD_ONS_ACCELERANTS="radeon.accelerant nv.accelerant mga.accelerant nm.accelerant"
|
BEOS_ADD_ONS_ACCELERANTS="radeon.accelerant nv.accelerant mga.accelerant nm.accelerant"
|
||||||
BEOS_ADD_ONS_TRANSLATORS="STXTTranslator RTF-Translator"
|
BEOS_ADD_ONS_TRANSLATORS="STXTTranslator RTF-Translator"
|
||||||
|
|||||||
Reference in New Issue
Block a user