- moved installation instructions to file INSTALL

- updated BasiliskII.spec and top-level Makefile

BasiliskII/BasiliskII.spec

@@ -29,7 +29,7 @@ Some features of Basilisk II:
   - Uses UAE 68k emulation or (under AmigaOS) real 68k processor
 
 %prep
-%setup -q
+%setup -n BasiliskII
 
 %build
 cd src/Unix
@@ -41,7 +41,7 @@ cd src/Unix
 make install
 
 %files
-%doc ChangeLog COPYING README TECH TODO
+%doc ChangeLog COPYING INSTALL README TECH TODO
 /usr/X11R6/bin/BasiliskII
 /usr/man/man1/BasiliskII.1
 /usr/share/BasiliskII/keycodes

BasiliskII/ChangeLog

@@ -1,4 +1,8 @@
 V0.7 (alpha)
+	- Source tree imported into CVS
+	- Unix: "basilisk_ii_keycodes" renamed to "keycodes", default
+	  location of keycodes file is now /usr/local/share/BasiliskII/keycodes
+	- Unix: improved the install target
 	- Unix/sys_unix.cpp: Sys_open() checks whether an HFS volume is currently
 	  mounted under Linux and tries to unmount it
 	- Unix/sys_unix.cpp: implemented SysAddDiskPrefs() for Linux (scans

BasiliskII/INSTALL

@@ -0,0 +1,115 @@
+BASILISK II INSTALLATION INSTRUCTIONS
+=====================================
+
+System Requirements
+-------------------
+
+To use Basilisk II, you need either a 512K Mac Classic ROM image or a
+512K or 1MB 32-bit clean Macintosh ROM image. You also need a copy of MacOS
+(0.x thru 7.5 for Classic emulation, 7.x or 8.0/8.1 for Mac II emulation).
+For copyright reasons, none of these items are included with Basilisk II.
+MacOS 7.5.3 and earlier versions can be downloaded from Apple and various
+other Internet sites. Mac ROM files are not freely available. You have to
+own a real Mac and read out its ROM. No, I don't know where you can download
+ROM files. No, I won't send you one.
+
+Depending on the platform you use, Basilisk II has additional requirements:
+
+BeOS:
+  You need BeOS R4 or better. On a PowerPC system you also need the
+  "sheep" driver that comes with SheepShaver. To use Ethernet, you need
+  the "sheep_net" add-on that also comes with SheepShaver (both items
+  are included in the SheepShaver Trial Versions). The PowerPC version of
+  Basilisk II cannot do Mac Classic emulation.
+
+Unix:
+  You need X11R6, pthreads support and GNU make. To use the GUI preferences
+  editor, you also need GTK+ version 1.2 or better. On Linux, you need
+  glibc 2.0 or better.
+
+AmigaOS:
+  You need at least a 68020 and AmigaOS 3.0 or better. To get the GUI
+  preferences editor, you need gtlayout.library V39 or later. To get sound
+  output, you need AHI V2 or later. Both items can be found on Aminet. You
+  also need the "PrepareEmul" utility that somes with ShapeShifter (or any
+  equivalent PrepareEmul substitute). The AmigaOS version of Basilisk II
+  cannot do Mac Classic emulation.
+
+Windows:
+  You need at least Windows NT 4.0. Windows 95 and 98 can be used too, with a
+  somewhat reduced set of features. Basilisk II supports DirectX version 5 or
+  later, but version 3 may also work, depending on your graphics card.
+
+
+Installation
+------------
+
+BeOS:
+  If you have a binary distribution of Basilisk II for BeOS, there are
+  executables for BeOS/PPC and/or BeOS/x86 included. If you have the source
+  distribution, do the following:
+
+    cd src/BeOS
+    make
+
+  Basilisk II cannot run concurrently with SheepShaver. Trying to do so will
+  crash Basilisk II, or SheepShaver, or both. On a PowerPC system you must
+  have installed the "sheep" driver that comes with SheepShaver. To use
+  Ethernet, you must have installed the "sheep_net" add-on that also comes
+  with SheepShaver 
+
+Unix:
+  To compile Basilisk II, do the following:
+
+    cd src/Unix
+    ./configure
+    make
+    make install    [optionally]
+
+  To use Ethernet networking under Linux, you either have to configure your
+  kernel for ethertap support or make and install the "sheep_net" driver:
+
+    cd src/Unix
+    make modules
+
+  This should produce a kernel module "sheep_net.o" in the "Linux/NetDriver"
+  directory. Now su root and say
+
+    ./MAKEDEV
+    /sbin/insmod sheep_net.o
+
+  This will install the device node "/dev/sheep_net" and load the driver.
+  You should give appropriate access rights to /dev/sheep_net if you don't
+  want to have to run Basilisk II as root.
+
+  This is what Brian J. Johnson says about compiling for IRIX:
+   "I recommend compiling with "-Ofast".  This requires changing "-g"
+    to "-Ofast" in the Makefile, and adding "-ipa" to LDFLAGS.  This
+    turns on massive interprocedural optimization, and makes for much
+    better performance."
+
+AmigaOS:
+  If you have a binary distribution of Basilisk II for AmigaOS, there is an
+  executable included. You must also have the "PrepareEmul" utility installed
+  that comes with ShapeShifter (or any equivalent PrepareEmul substitute,
+  see the ShapeShifter docs). If you have the source distribution, do the
+  following:
+
+    cd src/AmigaOS
+    smake
+
+  To recompile Basilisk II, you need SAS/C 6.58. Earlier versions may not work.
+
+Windows NT:
+  If you have a binary distribution of Basilisk II for Windows, there is a
+  Windows NT binary included. To access CD-ROMs under Windows NT, the driver
+  "cdenable.sys" must be copied to your "\WinNT\System32\drivers" directory.
+  To access CD-ROMs under Windows 9x, the driver "cdenable.vxd" must be copied
+  to the "\Windows\System" directory. To recompile Basilisk II, you need
+  MS Visual V++ 5.0 or later. Symantec C++ should work, too, with some
+  modifications. See the "sysdeps.h" file in the "Windows" directory.
+
+The ROM file has to be named "ROM" and put in the same directory as the
+Basilisk II executable but you can specify a different location for the ROM
+file with the "rom" option in the preferences file (or with the preferences
+GUI).

BasiliskII/Makefile

@@ -7,48 +7,60 @@ BEOSPPCARCHIVE = $(shell date +BasiliskII_beos_ppc_%d%m%Y.zip)
 BEOSX86ARCHIVE = $(shell date +BasiliskII_beos_x86_%d%m%Y.zip)
 
 BUILDDIR = /tmp/build
-DOCS = CHANGES COPYING README TECH TODO
+DOCS = ChangeLog COPYING INSTALL README TECH TODO
-SRC = src
+SRCS = src
+
+default:
+	@echo "This top-level Makefile is for creating Basilisk II distributions."
+	@echo "If you want to install Basilisk II on your system, please follow"
+	@echo "the instructions in the file INSTALL."
+	@echo "If you want to create a Basilisk II distribution, type \"make help\""
+	@echo "to get a list of possible targets."
+
+help:
+	@echo "The following targets are available:"
+	@echo "  tarball  source tarball ($(SRCARCHIVE))"
+	@echo "  rpm      source and binary RPMs"
+	@echo "  amiga    AmigaOS binary archive ($(AMIGAARCHIVE))"
+	@echo "  beosppc  BeOS/ppc binary archive ($(BEOSPPCARCHIVE))"
+	@echo "  beosx86  BeOS/x86 binary archive ($(BEOSX86ARCHIVE))"
 
 #
 # Source tarball
 #
 tarball: $(SRCARCHIVE)
 
-$(SRCARCHIVE): $(SRC) $(DOCS)
+$(SRCARCHIVE): $(SRCS) $(DOCS)
 	-rm -rf $(BUILDDIR)
 	mkdir $(BUILDDIR)
 	cd $(BUILDDIR); cvs checkout BasiliskII
-	rm $(BUILDDIR)/BasiliskII/BasiliskII.spec
+	rm -rf $(BUILDDIR)/BasiliskII/src/powerrom_cpu	#not yet ready for distribution
-	rm $(BUILDDIR)/BasiliskII/Makefile
-	rm -rf $(BUILDDIR)/BasiliskII/src/powerrom_cpu
 	cd $(BUILDDIR); tar cfz $@ BasiliskII
 	mv $(BUILDDIR)/$@ .
 	rm -rf $(BUILDDIR)
 
 #
-# Source RPM
+# RPMs
 #
-srcrpm: $(SRCARCHIVE) BasiliskII.spec
+rpm: /usr/src/redhat/SOURCES/$(SRCARCHIVE) BasiliskII.spec
+	rpm -ba BasiliskII.spec
 
-#
+/usr/src/redhat/SOURCES/$(SRCARCHIVE): $(SRCARCHIVE)
-# Binary RPM for Unix/i386
+	cp $(SRCARCHIVE) /usr/src/redhat/SOURCES
-#
-i386rpm:
 
 #
 # Binary archive for AmigaOS
 #
 amiga: $(AMIGAARCHIVE)
 
-$(AMIGAARCHIVE): $(SRC) $(DOCS) src/AmigaOS/BasiliskII
+$(AMIGAARCHIVE): $(SRCS) $(DOCS) src/AmigaOS/BasiliskII
 	-rm -rf $(BUILDDIR)
 	mkdir $(BUILDDIR)
 	mkdir $(BUILDDIR)/BasiliskII
 	cp $(DOCS) $(BUILDDIR)/BasiliskII
 	cp src/AmigaOS/BasiliskII $(BUILDDIR)/BasiliskII
 	cp src/AmigaOS/BasiliskII.info $(BUILDDIR)/BasiliskII.info
-	cd $(BUILDDIR); lha av $@ BasiliskII
+	cd $(BUILDDIR); lha a $@ BasiliskII
 	mv $(BUILDDIR)/$@ .
 	rm -rf $(BUILDDIR)
 
@@ -57,7 +69,7 @@ $(AMIGAARCHIVE): $(SRC) $(DOCS) src/AmigaOS/BasiliskII
 #
 beosppc: $(BEOSPPCARCHIVE)
 
-$(BEOSPPCARCHIVE): $(SRC) $(DOCS) src/BeOS/obj.ppc/BasiliskII
+$(BEOSPPCARCHIVE): $(SRCS) $(DOCS) src/BeOS/obj.ppc/BasiliskII
 	-rm -rf $(BUILDDIR)
 	mkdir $(BUILDDIR)
 	mkdir $(BUILDDIR)/BasiliskII
@@ -72,7 +84,7 @@ $(BEOSPPCARCHIVE): $(SRC) $(DOCS) src/BeOS/obj.ppc/BasiliskII
 #
 beosx86: $(BEOSX86ARCHIVE)
 
-$(BEOSX86ARCHIVE): $(SRC) $(DOCS) src/BeOS/obj.x86/BasiliskII
+$(BEOSX86ARCHIVE): $(SRCS) $(DOCS) src/BeOS/obj.x86/BasiliskII
 	-rm -rf $(BUILDDIR)
 	mkdir $(BUILDDIR)
 	mkdir $(BUILDDIR)/BasiliskII

BasiliskII/README

@@ -10,7 +10,7 @@ License
 -------
 
 Basilisk II is available under the terms of the GNU General Public License.
-See the file "COPYING" that is included in this archive for details.
+See the file "COPYING" that is included in the distribution for details.
 
 
 Overview
@@ -45,95 +45,11 @@ The emulator is not yet complete. See the file "TODO" for a list of
 unimplemented stuff.
 
 
-Requirements
+Requirements and Installation
-------------
+-----------------------------
 
-To use Basilisk II, you need either a 512K Mac Classic ROM image or a
+Please consult the file "INSTALL" for a list of system requirements and
-512K or 1MB 32-bit clean Macintosh ROM image. You also need a copy of MacOS
+installation instructions.
-(0.x thru 7.5 for Classic emulation, 7.x or 8.0/8.1 for Mac II emulation).
-For copyright reasons, none of these items are included with Basilisk II.
-MacOS 7.5.3 and earlier versions can be downloaded from Apple and various
-other Internet sites. Mac ROM files are not freely available. You have to
-own a real Mac and read out its ROM. No, I don't know where you can download
-ROM files. No, I won't send you one.
-
-Depending on the platform you use, Basilisk II has additional requirements:
-
-BeOS:
-  You need BeOS R4 or better. On a PowerPC system you also need the
-  "sheep" driver that comes with SheepShaver. To use Ethernet, you need
-  the "sheep_net" add-on that also comes with SheepShaver (both items
-  are included in the SheepShaver Trial Versions). The PowerPC version of
-  Basilisk II cannot do Mac Classic emulation.
-
-Unix:
-  You need X11R4, pthreads support and GNU make. To use the GUI preferences
-  editor, you also need GTK+ version 1.2 or better. On Linux, you need
-  glibc 2.0 or better.
-
-AmigaOS:
-  You need at least a 68020 and AmigaOS 3.0 or better. To get the GUI
-  preferences editor, you need gtlayout.library V39 or later. To get sound
-  output, you need AHI V2 or later. Both items can be found on Aminet. You
-  also need the "PrepareEmul" utility that somes with ShapeShifter (or any
-  equivalent PrepareEmul substitute). The AmigaOS version of Basilisk II
-  cannot do Mac Classic emulation.
-
-Windows:
-  You need at least Windows NT 4.0. Windows 95 and 98 can be used too, with a
-  somewhat reduced set of features. Basilisk II supports DirectX version 5 or
-  later, but version 3 may also work, depending on your graphics card.
-
-
-Installation
-------------
-
-BeOS:
-  If you have a binary distribution of Basilisk II for BeOS, there are
-  executables for BeOS/PPC and BeOS/x86 included. If you have the source
-  distribution, cd to "src/BeOS", and type "make". Basilisk II cannot run
-  concurrently with SheepShaver. Trying to do so will crash Basilisk II,
-  or SheepShaver, or both. On a PowerPC system you must have installed the
-  "sheep" driver that comes with SheepShaver. To use Ethernet, you must have
-  installed the "sheep_net" add-on that also comes with SheepShaver 
-
-Unix:
-  To compile Basilisk II, cd to "src/Unix", and type "./configure" followed
-  by "make" and (optionally) "make install". To use Ethernet networking under
-  Linux, you either have to configure your kernel for ethertap support or make
-  and install the "sheep_net" driver: cd to "src/Unix/Linux/NetDriver" and
-  type "make". This should produce a kernel module "sheep_net.o". Now su root
-  and type "./MAKEDEV" which will install the device node "/dev/sheep_net".
-  Then say "/sbin/insmod sheep_net.o" and the driver should be ready for use.
-  You should give appropriate access rights to /dev/sheep_net if you don't
-  want to run Basilisk II as root.
-
-  This is what Brian J. Johnson says about compiling for IRIX:
-   "I recommend compiling with "-Ofast".  This requires changing "-g"
-    to "-Ofast" in the Makefile, and adding "-ipa" to LDFLAGS.  This
-    turns on massive interprocedural optimization, and makes for much
-    better performance."
-
-AmigaOS:
-  If you have a binary distribution of Basilisk II for AmigaOS, there is an
-  executable included. You must also have the "PrepareEmul" utility installed
-  that comes with ShapeShifter (or any equivalent PrepareEmul substitute,
-  see the ShapeShifter docs). If you have the source distribution, cd to
-  "src/AmigaOS" and type "smake". To recompile Basilisk II, you need SAS/C
-  6.58. Earlier versions may not work.
-
-Windows NT:
-  If you have a binary distribution of Basilisk II for Windows, there is a
-  Windows NT binary included. To access CD-ROMs under Windows NT, the driver
-  "cdenable.sys" must be copied to your "\WinNT\System32\drivers" directory.
-  To access CD-ROMs under Windows 9x, the driver "cdenable.vxd" must be copied
-  to the "\Windows\System" directory. To recompile Basilisk II, you need
-  MS Visual V++ 5.0 or later. Symantec C++ should work, too, with some
-  modifications. See the "sysdeps.h" file in the "Windows" directory.
-
-The ROM file has to be named "ROM" and put in the same directory as the
-Basilisk II executable but you can specify a different location for the ROM
-file with the "rom" option in the preferences file.
 
 
 Configuration