After merging commits from formerly-split repos, repair documentation…

… and CI a bit. More required.
emaculation · Mar 28, 2019 · 19e0f58 · 19e0f58
1 parent 7876aa3
commit 19e0f58
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 146 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,15 +6,18 @@ matrix:
       dist: trusty
       sudo: required
       compiler: gcc
-
-addons:
-  apt:
-    packages:
-      - libsdl1.2-dev 
-      - libgtk2.0-dev
-
-script:
-  - cd BasiliskII/src/Unix
-  - NO_CONFIGURE=1 ./autogen.sh
-  - ./configure --enable-sdl-video --enable-sdl-audio --disable-vosf --disable-jit-compiler --with-x --with-gtk --with-mon
-  - make -j 4
+      env: BADGE=linux
+      addons:
+        apt:
+          packages:
+            - libsdl1.2-dev
+            - libgtk2.0-dev
+      script:
+        - cd BasiliskII/src/Unix
+        - NO_CONFIGURE=1 ./autogen.sh
+        - ./configure --enable-sdl-video --enable-sdl-audio --disable-vosf --disable-jit-compiler --with-x --with-gtk --with-mon
+        - make -j 4
+    - os: osx
+      env: BADGE=osx
+      script:
+        - true
diff --git a/BasiliskII/.travis.yml b/BasiliskII/.travis.yml
diff --git a/BasiliskII/README.md b/BasiliskII/README.md
@@ -2,15 +2,6 @@
 
 A 68k Macintosh emulator
 
-Platform | CI Status |
----------|:----------------
-AmigaOS  | [Deprecate 💀](https://github.com/emaculation/BasiliskII/issues/81)
-BeOS     | [Deprecate 💀](https://github.com/emaculation/BasiliskII/issues/82)
-FreeBSD  | [Costs 💰](https://cirrus-ci.org/pricing/)
-Linux    | [![Linux Build Status](http://badges.herokuapp.com/travis/emaculation/BasiliskII?env=BADGE=linux&label=build&branch=master)](https://travis-ci.org/emaculation/BasiliskII)
-OSX      | [![OSX Build Status](http://badges.herokuapp.com/travis/emaculation/BasiliskII?env=BADGE=osx&label=build&branch=master)](https://travis-ci.org/emaculation/BasiliskII) [Null ⚠️](https://github.com/emaculation/BasiliskII/issues/84)
-Windows  | [![Windows Build status](https://ci.appveyor.com/api/projects/status/b1h82askjdqev1on/branch/master?svg=true)](https://ci.appveyor.com/project/ianfixes/basiliskii)
-
 ## License
 
 Basilisk II is available under the terms of the GNU General Public License. See the file "LICENSE" that is included in the distribution for details.
@@ -579,7 +570,7 @@ You can use the serial ports in Basilisk II to connect to the Internet with a mo
 
 ## Technical Documentation
 
-Please see the included file "TECH" for a technical overview of the emulator.
+Please see the included file "TECH.md" for a technical overview of the emulator.
 
 ## Acknowledgements
 
@@ -606,57 +597,3 @@ Special thanks to:
 - All ShapeShifter and SheepShaver users and beta testers
 - Apple Computer Inc., who made writing a Macintosh emulator a child's play
 
-## Bug reports
-
-You found a bug? Well, use the source, fix it and send the fix to
-[email protected]>
-for inclusion in the next release of Basilisk II.
-
-If you don't have a fix, you should post a bug report using the Source Forge bug tracker, supplying as much information as possible (operating system and versions of Basilisk II and MacOS being used, relevant hardware information, the exact steps to reproduce the bug, etc.):
-http://sourceforge.net/tracker/?group_id=2123&atid=102123
-
-I also strongly suggest reading this before posting a bug report:
-http://www.chiark.greenend.org.uk/~sgtatham/bugs.html
-
-## Author
-
-You can contact me at <[email protected]>, but please don't do so unless absolutely necessary. I'm maintaining Basilisk II in my spare time and am not able to provide technical support for everyone. If you have questions, consider posting them to one of the support forums mentioned below.
-
-You are encouraged to contact me personally when
-- you have bug fixes or small enhancements for the code
-- you want to port Basilisk II to another platform
-- you want to discuss technical issues
-- you intend to make major changes to the source; you might be working on something that I have already done, or I may have different ideas about the Right Way to do it
-
-There is no point in sending me questions about
-- ROM files and how/where to get them
-- versions of Basilisk II that run on operating systems other than Unix, BeOS and AmigaOS. If you are using any other operating system, there's no point in asking me how to to X or why Y doesn't work because I won't know either. Instead, you should look in the "Acknowledgements" section of this manual to find the person responsible. For example, if your question is specific to the Windows operating system, ask Lauri Pesonen. I don't have Windows and can't answer your questions and I'm too lazy to forward mail to Lauri myself. In any case, it would probably be better to post your questions to a public forum as it will get a much wider audience there.
-
-## Support
-
-The official Basilisk II home page is at
-http://www.uni-mainz.de/~bauec002/B2Main.html
-
-The Basilisk II project page on SourceForge is at
-http://sourceforge.net/projects/basilisk/
-
-If you have problems, you may want to visit the Basilisk II forums:
-http://sourceforge.net/forum/?group_id=2123
-
-There is also a mailing list for Basilisk II users:
-http://lists.sourceforge.net/lists/listinfo/basilisk-user
-
-And another mailing list for Basilisk II developers:
-http://lists.sourceforge.net/lists/listinfo/basilisk-devel
-
-Some general advice about asking technical support questions can be found at
-http://www.catb.org/~esr/faqs/smart-questions.html
-
-Keeping this in mind will greatly increase your chances of getting a useful answer.
-
-## History
-
-Please consult the file "ChangeLog" for the release history.
-
-Christian Bauer
-[email protected]
diff --git a/README.md b/README.md
@@ -1,3 +1,15 @@
+Platform | BasiliskII Build | SheepShaver Build
+---------|:-----------------|:------------------
+AmigaOS  | [Deprecate 💀](https://github.com/emaculation/macemu/issues/81) | [Deprecate 💀](https://github.com/emaculation/macemu/issues/81)
+BeOS     | [Deprecate 💀](https://github.com/emaculation/macemu/issues/82) | [Deprecate 💀](https://github.com/emaculation/macemu/issues/82)
+FreeBSD  | [Costs 💰](https://cirrus-ci.org/pricing/) | [Costs 💰](https://cirrus-ci.org/pricing/)
+Linux    | [![Linux Build Status](http://badges.herokuapp.com/travis/emaculation/macemu?env=BADGE=linux&label=build&branch=master)](https://travis-ci.org/emaculation/macemu) | Soon
+OSX      | [![OSX Build Status](http://badges.herokuapp.com/travis/emaculation/macemu?env=BADGE=osx&label=build&branch=master)](https://travis-ci.org/emaculation/macemu) [Null ⚠️](https://github.com/emaculation/macemu/issues/84) | Soon
+Windows  | [![Windows Build status](https://ci.appveyor.com/api/projects/status/k47o17u31v1xh175/branch/master?svg=true)](https://ci.appveyor.com/project/ianfixes/macemu) | Soon
+
+
+### Supported Builds
+
 #### BasiliskII
 ```
 macOS 64-bit ---
@@ -52,3 +64,39 @@ $ cd src/Windows
 $ ../Unix/autogen.sh
 $ make
 ```
+
+
+## Bug reports
+
+You found a bug? Well, open an issue in this repo, supplying as much information as possible (operating system and versions of Basilisk II and MacOS being used, relevant hardware information, the exact steps to reproduce the bug, etc.)
+
+I also strongly suggest reading this before posting a bug report:
+http://www.chiark.greenend.org.uk/~sgtatham/bugs.html
+
+
+## Support
+
+There is no point in sending questions about ROM files and how/where to get them.
+
+
+### These are almost certainly outdated
+
+The official Basilisk II home page is at
+http://www.uni-mainz.de/~bauec002/B2Main.html
+
+The Basilisk II project page on SourceForge is at
+http://sourceforge.net/projects/basilisk/
+
+If you have problems, you may want to visit the Basilisk II forums:
+http://sourceforge.net/forum/?group_id=2123
+
+There is also a mailing list for Basilisk II users:
+http://lists.sourceforge.net/lists/listinfo/basilisk-user
+
+And another mailing list for Basilisk II developers:
+http://lists.sourceforge.net/lists/listinfo/basilisk-devel
+
+Some general advice about asking technical support questions can be found at
+http://www.catb.org/~esr/faqs/smart-questions.html
+
+Keeping this in mind will greatly increase your chances of getting a useful answer.
diff --git a/SheepShaver/.travis.yml b/SheepShaver/.travis.yml
diff --git a/SheepShaver/README.md b/SheepShaver/README.md
@@ -1,13 +1,4 @@
 # SheepShaver
 MacOS run-time environment for BeOS and Linux
 
-Platform | CI Status|
----------|:----------------
-AmigaOS  | Deprecate 💀
-BeOS     | Deprecate 💀
-FreeBSD  | [Costs 💰](https://cirrus-ci.org/pricing/)
-Linux    | [![Linux Build Status](http://badges.herokuapp.com/travis/emaculation/SheepShaver?env=BADGE=linux&label=build&branch=master)](https://travis-ci.org/emaculation/SheepShaver)
-OSX      | [![OSX Build Status](http://badges.herokuapp.com/travis/emaculation/SheepShaver?env=BADGE=osx&label=build&branch=master)](https://travis-ci.org/emaculation/SheepShaver) Null ⚠️
-Windows  | [![Windows Build status](https://ci.appveyor.com/api/projects/status/pxw2cf78ls0ee3ff/branch/master?svg=true)](https://ci.appveyor.com/project/ianfixes/SheepShaver) Null ⚠️
-
 Originally hosted at https://sheepshaver.cebix.net/
diff --git a/SheepShaver/appveyor.yml b/SheepShaver/appveyor.yml
diff --git a/BasiliskII/appveyor.yml → appveyor.yml b/BasiliskII/appveyor.yml → appveyor.yml
@@ -6,6 +6,11 @@ environment:
   matrix:
     - CYG_ARCH: x86_64
       CYG_ROOT: C:/cygwin64
+      MACEMU_PRJOECT: BasiliskII
+    - CYG_ARCH: x86_64
+      CYG_ROOT: C:/cygwin64
+      MACEMU_PRJOECT: SheepShaver
+
 
 build: off
 
@@ -16,6 +21,8 @@ before_test:
 test_script:
   # https://help.appveyor.com/discussions/problems/5170-progresspreference-not-works-always-shown-preparing-modules-for-first-use-in-stderr
   - ps: $ProgressPreference = "SilentlyContinue"
+  - cd $MACEMU_PROJECT
+  - ($env:MACEMU_PROJECT -eq "SheepShaver") && make links
   - cd src/Windows
   - sh ../Unix/autogen.sh
   - make