- removed configure option for the new PIT model from documentation and perl

build script
- added --enable-new-pit to the deprecated section of the configure script
- show DEPRECATED messages in configure script in uppercase letters (most of
  them should be removed before the next major release)
This commit is contained in:
Volker Ruppert 2007-04-09 08:46:24 +00:00
parent dee9f1b9b5
commit 2a6200040e
3 changed files with 31 additions and 37 deletions

View File

@ -1,6 +1,6 @@
#!/usr/bin/perl
#####################################################################
# $Id: batch-build.perl,v 1.9 2002-10-26 13:14:11 bdenney Exp $
# $Id: batch-build.perl,v 1.10 2007-04-09 08:46:24 vruppert Exp $
#####################################################################
#
# Batch build tool for multiple configurations
@ -68,9 +68,9 @@ add_configuration ('plug-allgui',
add_configuration ('plug-allgui-d',
'--enable-plugins --with-all-libs --enable-debugger');
add_configuration ('plug-smp',
'--enable-plugins --enable-processors=2');
'--enable-plugins --enable-smp');
add_configuration ('plug-smp-d',
'--enable-plugins --enable-processors=2 --enable-debugger');
'--enable-plugins --enable-smp --enable-debugger');
add_configuration ('plug-x86-64',
'--enable-plugins --enable-x86-64');
add_configuration ('plug-wx',
@ -79,17 +79,11 @@ add_configuration ('plug-wx',
if ($TEST_DEVICES) {
add_configuration ('alldev',
'--enable-ne2000 --enable-pci --enable-dc2300-vlb-ide --enable-port-e9-hack --enable-cdrom --enable-iodebug');
add_configuration ('oldpit',
'--disable-new-pit');
add_configuration ('rtpit',
'--enable-realtime-pit');
'--enable-ne2000 --enable-pci --enable-port-e9-hack --enable-cdrom --enable-iodebug');
add_configuration ('ne2000',
'--enable-ne2000');
add_configuration ('pci',
'--enable-pci');
add_configuration ('dc2300-vlb-ide',
'--enable-dc2300-vlb-ide');
add_configuration ('port-e9-hack',
'--enable-port-e9-hack');
add_configuration ('cdrom',
@ -152,14 +146,14 @@ add_configuration ('cpuall',
if ($TEST_SMP) {
# smp
add_configuration ('smp2',
'--enable-processors=2');
add_configuration ('smp2-d',
'--enable-processors=2 --enable-debugger');
add_configuration ('smp4-wx',
'--enable-processors=4 --with-wx');
add_configuration ('smp4-wx-d',
'--enable-processors=4 --with-wx --enable-debugger');
add_configuration ('smp',
'--enable-smp');
add_configuration ('smp-d',
'--enable-smp --enable-debugger');
add_configuration ('smp-wx',
'--enable-smp --with-wx');
add_configuration ('smp-wx-d',
'--enable-smp --with-wx --enable-debugger');
}
if ($TEST_X86_64) {

View File

@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
AC_INIT(bochs.h)
AC_REVISION([[$Id: configure.in,v 1.335 2007-04-08 21:57:05 sshwarts Exp $]])
AC_REVISION([[$Id: configure.in,v 1.336 2007-04-09 08:46:24 vruppert Exp $]])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_HEADER(ltdlconf.h)
@ -2744,7 +2744,7 @@ AC_MSG_CHECKING(for specified CMOS start time (deprecated))
AC_ARG_ENABLE(time0,
[ --enable-time0=n start at n (deprecated)],
[AC_MSG_RESULT($enableval)
AC_MSG_ERROR([deprecated option - use runtime option 'clock' instead])
AC_MSG_ERROR([DEPRECATED - use runtime option 'clock' instead])
],
[
AC_MSG_RESULT(no)
@ -2754,7 +2754,7 @@ AC_MSG_CHECKING(for configuration interface (deprecated))
AC_ARG_ENABLE(config-interface,
[ --enable-config-interface turns on/off configuration interface (deprecated)],
[AC_MSG_RESULT($enableval)
AC_MSG_ERROR([deprecated option - configuration interface is always enabled])
AC_MSG_ERROR([DEPRECATED - configuration interface is always enabled])
],
[
AC_MSG_RESULT(no)
@ -2764,7 +2764,7 @@ AC_MSG_CHECKING(for control panel (deprecated))
AC_ARG_ENABLE(control-panel,
[ --enable-control-panel turns on/off contol panel (deprecated)],
[AC_MSG_RESULT($enableval)
AC_MSG_ERROR([deprecated option - configuration interface is always enabled])
AC_MSG_ERROR([DEPRECATED - configuration interface is always enabled])
],
[
AC_MSG_RESULT(no)
@ -2774,7 +2774,7 @@ AC_MSG_CHECKING(for VGA emulation (deprecated))
AC_ARG_ENABLE(vga,
[ --enable-vga use VGA emulation (deprecated)],
[AC_MSG_RESULT($enableval)
AC_MSG_ERROR([deprecated option - standard VGA emulation is always enabled])
AC_MSG_ERROR([DEPRECATED - standard VGA emulation is always enabled])
],
[
AC_MSG_RESULT(no)
@ -2784,7 +2784,7 @@ AC_MSG_CHECKING(for number of processors (deprecated))
AC_ARG_ENABLE(processors,
[ --enable-processors select number of processors (deprecated)],
[AC_MSG_RESULT($enableval)
AC_MSG_ERROR([deprecated - use option --enable-smp instead])
AC_MSG_ERROR([DEPRECATED - use option --enable-smp instead])
],
[
AC_MSG_RESULT(no)
@ -2794,7 +2794,7 @@ AC_MSG_CHECKING(whether to reset on triple fault (deprecated))
AC_ARG_ENABLE(reset-on-triple-fault,
[ --enable-reset-on-triple-fault reset when cpu detects a triple fault (deprecated)],
[AC_MSG_RESULT($enableval)
AC_MSG_ERROR([deprecated - could be configured directly from .bochsrc instead])
AC_MSG_ERROR([DEPRECATED - could be configured directly from .bochsrc instead])
],
[
AC_MSG_RESULT(no)
@ -2804,7 +2804,17 @@ AC_MSG_CHECKING(PNI support (deprecated))
AC_ARG_ENABLE(--enable-pni,
[ --enable-pni PNI support (deprecated)],
[AC_MSG_RESULT($enableval)
AC_MSG_ERROR([deprecated - use --enable-sse=3 instead])
AC_MSG_ERROR([DEPRECATED - use --enable-sse=3 instead])
],
[
AC_MSG_RESULT(no)
])
AC_MSG_CHECKING(for new PIT model (deprecated))
AC_ARG_ENABLE(new-pit,
[ --enable-new-pit use Greg Alexander's new PIT model (deprecated)],
[AC_MSG_RESULT($enableval)
AC_MSG_ERROR([DEPRECATED - the new PIT model is always present and the old one has been removed])
],
[
AC_MSG_RESULT(no)

View File

@ -1,7 +1,7 @@
<!--
================================================================
doc/docbook/user/user.dbk
$Id: user.dbk,v 1.224 2007-03-31 09:24:03 vruppert Exp $
$Id: user.dbk,v 1.225 2007-04-09 08:46:24 vruppert Exp $
This is the top level file for the Bochs Users Manual.
================================================================
@ -2068,16 +2068,6 @@ turn it off.
currently supported on Linux and win32 only.
</entry>
</row>
<row>
<entry>--enable-new-pit</entry>
<entry>yes</entry>
<entry>
Enables Greg Alexander's PIT model, written during Summer 2001. This
model was written from scratch to be much more complete than the old
Bochs PIT model, which was missing many registers and features.
If you disable this option, the old PIT model will be used instead.
</entry>
</row>
<row>
<entry>--enable-idle-hack</entry>
<entry>no</entry>