Commit Graph

143 Commits

Author SHA1 Message Date
Bryce Denney
26a6d3350c - "make clean" cleans only the top directory. So why did we have
rm */*.o in here?
2002-12-24 15:01:12 +00:00
Bryce Denney
98ec281e28 - don't install DOC-win32.html. it's out of date and I don't have time
to fix it.
2002-12-21 19:23:08 +00:00
Bryce Denney
bc72fcefa9 - BeBochs.rsrc cannot be checked into CVS directly because that damages
its resources.  So now we will distribute a .zip file which will only
  be unzipped on the target BeOS machine.
2002-12-21 15:51:41 +00:00
Bryce Denney
e3548a3708 - fix a broken configure subst variable @EXE@ 2002-12-21 14:41:49 +00:00
Bryce Denney
9780ad2ad8 - correct BeBochs.rc path 2002-12-21 14:32:10 +00:00
Bryce Denney
8bacd82133 - add BeOS target which builds the binary and then runs "copyattr"
to copy the resources into the binary
2002-12-21 14:31:30 +00:00
Bryce Denney
d1b711164a - make install for MacOSX should not produce a disk image too. Now
disk image creation is handled by build/macosx/make-dmg.sh.
2002-12-19 03:02:37 +00:00
Bryce Denney
b6db9b843d - copy the bochs.scpt into dlxlinux. With Br'fin's script changes,
you can double-click the bochs.scpt in dlxlinux and it will start Bochs.
2002-12-18 05:07:33 +00:00
Bryce Denney
006d21b626 - use updated DLX linux. I only updated DLX's bochsrc to make it more modern. 2002-12-14 22:43:56 +00:00
Bryce Denney
8b0a593ed4 - rename BXBIOS to BXSHARE. The problem with BXBIOS is that it needed to
be used for more things than just the BIOS.  Also the keymaps need to
  be located relative to the share path, and maybe other things like
  graphics and icons, later.
2002-12-14 22:18:00 +00:00
Bryce Denney
7e4ac4fc56 - add shortcut for downloading rendered docs from the website, for platforms
that have no docbook tools.
2002-12-14 21:17:25 +00:00
Bryce Denney
436d0119ce - make install should no longer copy docs-html. It needs to copy the
docbook files instead.
2002-12-13 22:50:39 +00:00
Bryce Denney
610116cf45 - if we're going to build docbook files, do it during make rather than
make install
2002-12-13 20:37:38 +00:00
Bryce Denney
4f4e6a2fa8 - add configure option --enable-docbook. If it is turned on, then during
make install it will build the docbook documentation and install it
  into $(prefix)/share/doc/bochs.  If it is not specified, then it will
  be enabled only if the program "docbook2html" is found in your path.
- this completes [ 652957 ] install docbook docs instead of HTML

Modified Files:
  Makefile.in configure configure.in doc/docbook/Makefile.in
2002-12-13 17:52:16 +00:00
Bryce Denney
36a61e04df - fix make dist-clean in docbook dir 2002-12-13 17:13:20 +00:00
Bryce Denney
8f0307539f - clean docbook directory too 2002-12-13 17:12:46 +00:00
Bryce Denney
f548660ca6 - see bug [ 652957 ] install docbook docs instead of HTML
- now configure script does substitutions in doc/docbook/Makefile.in
- add "make install_docbook" target in main makefile that runs make install
  in doc/docbook.  It will not be run unless you ask for it.

Modified Files:
  configure.in Makefile.in configure doc/docbook/Makefile.in
2002-12-13 16:21:04 +00:00
Bryce Denney
b53d3732b8 - apply patch 650066: use standard lib directory, from Robert Millan.
Change plugdir to have no version numbers.
2002-12-11 19:21:53 +00:00
Bryce Denney
1812808d82 - get rid of bochs-docs which didn't work anyway
- move DOC-linux.html into the docbook in a section called "Quick Start for
  Linux Users", and removed all references to the DOC-linux file that I could
  find.  Most of the text has been moved into the Linux RPM section.  Parts
  that did not fit into the docbook are now in doc/docbook/misc.txt.
- put vga.pcf into INSTALL_LIST_X11 so that it's only installed when
  you configure with --with-x11.
- transfer section on VGA font installation from docs-html into user guide
- remove RCS id from screen shots within user guide, since they are changed
  to the revision info of user.dbk.

Modified Files:
  Makefile.in configure configure.in build/linux/.cvsignore
  build/redhat/bochs.rpmspec.template doc/docbook/misc.txt
  doc/docbook/user/user.dbk doc/man/bochs-dlx.1 doc/man/bochs.1
  doc/man/bochsrc.5 doc/man/bximage.1 docs-html/install.html
Removed Files:
  build/linux/DOC-linux.html.in build/linux/bochs-docs.in
2002-12-11 19:16:20 +00:00
Bryce Denney
1fec3f065e - fix stupidity that I added in 1.109. It was putting bximage.o into the
source directory instead of the build directory.
2002-12-06 19:45:49 +00:00
Bryce Denney
a1f05bfd03 - the default for the workspaces is to build Win32 release. So that's where
the installer should find it.  This is checked in just after 2.0.pre3.
2002-12-05 18:12:35 +00:00
Bryce Denney
e334d500d2 - apply patch from Br'fin
[ 643874 ] MacOSX: diskimage.pl fix
2002-11-26 04:12:15 +00:00
Bryce Denney
56b67a6a8d - do feature request [ 640888 ] add default for BXBIOS env variable
- if BXBIOS is not defined, set it to a default value that is produced
  in the makefile.  This allows us to make disk image TAR packages that
  look for the bios images in the $BXBIOS directory.  These packages
  will be able find the current images for future Bochs versions, without
  any modifications.
2002-11-25 18:00:05 +00:00
Bryce Denney
eb8bb017a4 - fix make install_macosx in VPATH build. It has to use "test -e" to
look for things in its install list, which may be files or directories
  (like bochs.app)
2002-11-23 00:25:50 +00:00
Bryce Denney
6f798350f1 - previous rev was quite incomplete. Add the missing file lists. 2002-11-22 21:04:10 +00:00
Bryce Denney
bb3774e7e4 - add install_macosx target 2002-11-22 06:33:46 +00:00
Bryce Denney
9acf9f4198 - just to make it easier to read, move definition of some makefile
variables so that they are defined above the first time they are
  used.  "make" works ok either way.
2002-11-22 03:36:08 +00:00
Bryce Denney
5d05917565 - fix my stupid typo in macosx section. It should copy the resource fork
to a file called $(SCRIPT_COMPILED_RSRC).
2002-11-22 03:30:18 +00:00
Bryce Denney
7382b84f8c - A new GUI is born!
add SVGALIB display library by Igor Popik <igipop@wsfiz.edu.pl>
  While it's running, you can press F12 to escape into the runtime config
  menu, and then you can change disks or quit or whatever.

  Better not try it with the bochs debugger...you could get stuck.

Modified Files:
  Makefile.in config.h.in configure configure.in main.cc
  plugin.h gui/Makefile.in
Added Files:
  gui/svga.cc
Removed Files:
  patches/patch.svgalib-gui patches/patch.svgalib-gui-f12
2002-11-21 19:26:07 +00:00
Bryce Denney
1d106e59ad - small hack to make VPATH build work. 2002-11-21 17:52:59 +00:00
Bryce Denney
a648fc5a63 - clean up bochs.app and bochs.scpt files that are generated on MacOSX 2002-11-21 17:30:41 +00:00
Bryce Denney
4a01410fd0 - edit MacOSX make target to support building the applescript in two steps.
Step 1, the compile, must be done locally on a MacOSX machine.  This
  gives us the contents of the resource fork, which will be checked into
  CVS as script_compiled.rsrc every time the script sources change.  Step 2
  can be done remotely on the SF compile farm: reconstruct the script
  from the separate data and resource fork files.
- not all filesystems support resource forks!  I added a test in the
  makefile to check that the resource fork is accessible, so that at least
  we will get a clear error message if the filesystem doesn't support it.
2002-11-21 17:26:48 +00:00
Bryce Denney
9b7955c732 - rename VGABIOS-lgpl-README to .txt as well 2002-11-21 06:38:56 +00:00
Bryce Denney
0ab5bfa1d2 - move "$(LIBTOOL) --mode=link" into the @LINK@ configure variable, so that
it doesn't show up in nmake makefiles
2002-11-20 20:42:40 +00:00
Bryce Denney
bb428aaeb9 - use $(srcdir) to make VPATH compile work for bximage 2002-11-20 13:01:57 +00:00
Bryce Denney
e0b4cb6421 - nongnu make programs don't like "$<" except in pattern rules 2002-11-20 03:17:12 +00:00
Bryce Denney
002b7a3145 - the files in INSTALL_LIST_BIN_OPTIONAL were being omitted in
"make install_win32"
2002-11-19 21:31:00 +00:00
Bryce Denney
ab6cb49693 - this fixes bug #638600: need default plugin search path
- configure script adds -DBX_PLUGIN_PATH="${plugdir}" to CFLAGS/CXXFLAGS
  in the Makefile.
- in main.cc, if plugins enabled and the environment variable LTDL_LIBRARY_PATH
  is not set, then it gets set to the value supplied by BX_PLUGIN_PATH.

Modified Files:
  main.cc Makefile.in configure.in config.h.in configure
2002-11-18 02:32:53 +00:00
Bryce Denney
d3c734f3be - apply patch from Volker, who says:
> Dlltool creates a useless file called 'mingwex'.
  > I think the first dlltool call should only contain bochs object files and
  > no link options or external libraries.
2002-11-16 17:56:05 +00:00
Bryce Denney
53e9cc60e9 - remove GUI_LINK_OPTS from the dlltool line. The dlltool line only really
needs to include the .o's and .a's that are part of the Bochs source code
  so that it can create a list of Bochs symbols that need to be exported.
  I started out using the same list as the link line, but dlltool
  doesn't accept all the same options as the link such as -I and -L.
2002-11-16 12:55:09 +00:00
Bryce Denney
1bd9a44a9e - plugins are now called libbx_NAME.so for unix and bx_NAME.dll for win32.
- plugins are installed into ${plugdir} which is defined to be
  ${libdir}/bochs-${VERSION}/plugins.

Modified Files:
  Makefile.in plugin.cc configure.in configure gui/Makefile.in
  iodev/Makefile.in
2002-11-14 18:45:49 +00:00
Bryce Denney
0c734d9a4d - commit patch [ 629157 ] MacOSX Carbon Plugin Cleanup
by Jeremy Parsons <brefin@mac.com>
- modified: configure.in configure Makefile.in main.cc
2002-11-01 17:53:52 +00:00
Bryce Denney
692ee03065 - add "--export-all-symbols" to the dlltool line that produces bochs.def.
I believe that if we had correct BOCHSAPI macros on everything then it
  would not be necessary, and on my cygwin box it isn't necessary.  However
  it seems that on other versions of cygwin it is necessary.  The trouble with
  --export-all-symbols is that it's making bochs.exp much bigger so the binary
  grows by 900k, compared to exporting only the symbols that are marked.  If
  someone with that "other" version of cygwin can figure out where BOCHSAPI is
  needed, this can be removed.
2002-11-01 13:44:43 +00:00
Bryce Denney
a6aa9afd67 - rename "control" to "textconfig". It was named when we called it
a control panel, but now we're calling it a text configuration interface.

Modified:
    .bochsrc Makefile.in bochs.h main.cc cpu/Makefile.in
    debug/Makefile.in disasm/Makefile.in fpu/Makefile.in
    gui/Makefile.in iodev/Makefile.in memory/Makefile.in
2002-10-29 20:18:32 +00:00
Gregory Alexander
0201b362e1 Make the libtool --mode=link explicit for the main bochs link call.
This fixes a problem with linking under AIX.
2002-10-28 19:40:23 +00:00
Gregory Alexander
0987a6b2d8 bximage is a C program, not a C++ program.
Update Makefile.in to compile it that way.

This fixes a VisualAge problem which prevented bximage from compiling.


I still use the C++ linker for bximage since I don't think it
makes any difference.  If it does, that should be changed also.
2002-10-28 19:19:46 +00:00
Bryce Denney
fe7e2f5912 - add srcdir and VPATH 2002-10-28 08:42:28 +00:00
Bryce Denney
5e520261db Add plugin support to Bochs by merging all the changes from the
BRANCH_PLUGINS branch!

Authors:
  Bryce Denney
  Christophe Bothamy
  Kevin Lawton (we grabbed a lot of plugin code from plex86)
Testing help from:
  Volker Ruppert
  Don Becker (Psyon)
  Jeremy Parsons (Br'fin)

The change log is too long to paste in here.  To read the change log, do
  cvs log patches/patch.final-from-BRANCH_PLUGINS.gz

All the changes and a detailed description are contained in a patch
called patch.final-from-BRANCH_PLUGINS.gz.  To look at the complete
patch, do
  cvs upd -r1.1 patches/patch.final-from-BRANCH_PLUGINS.gz

Then you will have a local copy of the patch, which you can gunzip and
play with however you want.

Modified Files:
    .bochsrc Makefile.in aclocal.m4 bochs.h config.h.in configure
    configure.in gdbstub.cc logio.cc main.cc pc_system.cc
    pc_system.h state_file.h bios/Makefile.in bios/rombios.c
    cpu/Makefile.in cpu/access.cc cpu/apic.cc cpu/arith16.cc
    cpu/arith32.cc cpu/arith8.cc cpu/cpu.cc cpu/cpu.h
    cpu/ctrl_xfer32.cc cpu/exception.cc cpu/fetchdecode.cc
    cpu/fetchdecode64.cc cpu/flag_ctrl.cc cpu/flag_ctrl_pro.cc
    cpu/init.cc cpu/io.cc cpu/logical16.cc cpu/logical32.cc
    cpu/logical8.cc cpu/paging.cc cpu/proc_ctrl.cc
    cpu/protect_ctrl.cc cpu/segment_ctrl_pro.cc cpu/shift16.cc
    cpu/shift32.cc cpu/stack64.cc cpu/string.cc cpu/tasking.cc
    debug/Makefile.in debug/dbg_main.cc disasm/Makefile.in
    doc/docbook/user/user.dbk dynamic/Makefile.in fpu/Makefile.in
    gui/Makefile.in gui/amigaos.cc gui/beos.cc gui/carbon.cc
    gui/control.cc gui/control.h gui/gui.cc gui/gui.h
    gui/keymap.cc gui/keymap.h gui/macintosh.cc gui/nogui.cc
    gui/rfb.cc gui/sdl.cc gui/sdlkeys.h gui/siminterface.cc
    gui/siminterface.h gui/term.cc gui/win32.cc gui/wx.cc
    gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc gui/wxmain.h
    gui/x.cc gui/keymaps/sdl-pc-de.map gui/keymaps/sdl-pc-us.map
    gui/keymaps/x11-pc-de.map instrument/example0/instrument.h
    instrument/example1/instrument.h
    instrument/stubs/instrument.cc instrument/stubs/instrument.h
    iodev/Makefile.in iodev/biosdev.cc iodev/biosdev.h
    iodev/cdrom.cc iodev/cmos.cc iodev/cmos.h iodev/devices.cc
    iodev/dma.cc iodev/dma.h iodev/eth_fbsd.cc iodev/eth_linux.cc
    iodev/eth_null.cc iodev/eth_tap.cc iodev/floppy.cc
    iodev/floppy.h iodev/guest2host.cc iodev/guest2host.h
    iodev/harddrv.cc iodev/harddrv.h iodev/iodebug.cc
    iodev/iodebug.h iodev/iodev.h iodev/keyboard.cc
    iodev/keyboard.h iodev/ne2k.cc iodev/ne2k.h iodev/parallel.cc
    iodev/parallel.h iodev/pci.cc iodev/pci.h iodev/pci2isa.cc
    iodev/pci2isa.h iodev/pic.cc iodev/pic.h iodev/pit.cc
    iodev/pit.h iodev/pit_wrap.cc iodev/pit_wrap.h iodev/sb16.cc
    iodev/sb16.h iodev/scancodes.cc iodev/scancodes.h
    iodev/serial.cc iodev/serial.h iodev/slowdown_timer.cc
    iodev/slowdown_timer.h iodev/unmapped.cc iodev/unmapped.h
    iodev/vga.cc iodev/vga.h memory/Makefile.in memory/memory.cc
    memory/memory.h memory/misc_mem.cc misc/bximage.c
    misc/niclist.c
Added Files:
    README-plugins extplugin.h ltdl.c ltdl.h ltdlconf.h.in
    ltmain.sh plugin.cc plugin.h
2002-10-24 21:07:56 +00:00
Bryce Denney
7f8b965243 ----------------------------------------------------------------------
Patch name: patch.macosx-console-launch-script
Author: Jeremy Parsons <brefin@mac.com>
Date: Wed Oct 16 2002

Detailed description:

Since the Carbon gui does not yet have a console window of its own, then it
can't be configured from the gui (only the command line) and stdout/stderr both
go to the console. As a shortcut, I offer this patch consisting of this file and

build/macosx/script.data
build/macosx/script.r
build/macosx/bochs.applescript

script.data and script.r are taken from a script compiled into an application.
Flattened out to be checked in. (osacompile can produce runnable scripts, but
wants to create them for the classic environment, so I use these files as part
of a workaround)

When bochs.app is built, it also builds bochs.scpt. To use bochs.scpt you put
both bochs.app and bochs.scpt into the directory with your bochsrc.txt.

bochs.scpt is an applescript that when run notes the current directory, then
tells the terminal application to open a window, cd to the current directory,
and run bochs from the commandline.
----------------------------------------------------------------------

Modified Files:
  Makefile.in
Added Files:
  build/macosx/bochs.applescript build/macosx/script.data
  build/macosx/script.r
2002-10-21 11:38:38 +00:00
Bryce Denney
37be797307 - bochsdbg is an OPTIONAL install target. I build a bochsdbg.exe manually
when making windows releases, and copy it into the build directory.
  However, since some make programs (e.g. freebsd)  are giving errors when
  bochsdbg is not found (in Linux it just gives a little warning), I have tried
  to do it in a more clean way.  I put bochsdbg into an "optional" install
  list, and put a minus before the line that installs optional files.  This
  should cause make to ignore any errors that occur while trying to install the
  optional ones.
2002-10-21 11:28:37 +00:00