|
From: <ama...@us...> - 2008-08-01 21:32:15
|
Revision: 19095
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19095&view=rev
Author: amatthies
Date: 2008-08-01 21:32:15 +0000 (Fri, 01 Aug 2008)
Log Message:
-----------
Updated to 2.0
Modified Paths:
--------------
branches/amatthies/current/vice/ChangeLog
branches/amatthies/current/vice/Makefile.am
branches/amatthies/current/vice/README
branches/amatthies/current/vice/build/macosx/build-vice-release.sh
branches/amatthies/current/vice/build/riscos/build-cross.sh
branches/amatthies/current/vice/configure.in
branches/amatthies/current/vice/doc/Makefile.am
branches/amatthies/current/vice/doc/Readme.beos
branches/amatthies/current/vice/doc/ReadmeMacOSX.txt
branches/amatthies/current/vice/doc/Win32-Cygwin-HOWTO.txt
branches/amatthies/current/vice/doc/html/Makefile.am
branches/amatthies/current/vice/doc/html/hpux.html
branches/amatthies/current/vice/doc/html/index.html
branches/amatthies/current/vice/doc/html/macosx.html
branches/amatthies/current/vice/doc/html/plain/BUGS
branches/amatthies/current/vice/doc/html/plain/NEWS
branches/amatthies/current/vice/doc/html/qnx.html
branches/amatthies/current/vice/doc/html/sco.html
branches/amatthies/current/vice/doc/vice.texi
branches/amatthies/current/vice/po/ChangeLog
branches/amatthies/current/vice/po/de.po
branches/amatthies/current/vice/po/fr.po
branches/amatthies/current/vice/po/hu.po
branches/amatthies/current/vice/po/it.po
branches/amatthies/current/vice/po/nl.po
branches/amatthies/current/vice/po/pl.po
branches/amatthies/current/vice/po/sv.po
branches/amatthies/current/vice/src/ChangeLog
branches/amatthies/current/vice/src/Makefile.am
branches/amatthies/current/vice/src/arch/amigaos/README.AMIGA
branches/amatthies/current/vice/src/arch/amigaos/c128uires.h
branches/amatthies/current/vice/src/arch/amigaos/c64uires.h
branches/amatthies/current/vice/src/arch/amigaos/cbm2uires.h
branches/amatthies/current/vice/src/arch/amigaos/intl.c
branches/amatthies/current/vice/src/arch/amigaos/intl.txt
branches/amatthies/current/vice/src/arch/amigaos/joyai.c
branches/amatthies/current/vice/src/arch/amigaos/petuires.h
branches/amatthies/current/vice/src/arch/amigaos/plus4uires.h
branches/amatthies/current/vice/src/arch/amigaos/private.h
branches/amatthies/current/vice/src/arch/amigaos/ui.c
branches/amatthies/current/vice/src/arch/amigaos/uires.h
branches/amatthies/current/vice/src/arch/amigaos/vic20uires.h
branches/amatthies/current/vice/src/arch/amigaos/video.c
branches/amatthies/current/vice/src/arch/beos/Makefile.am
branches/amatthies/current/vice/src/arch/beos/console.c
branches/amatthies/current/vice/src/arch/beos/constants.h
branches/amatthies/current/vice/src/arch/beos/ui.cc
branches/amatthies/current/vice/src/arch/beos/ui_file.cc
branches/amatthies/current/vice/src/arch/beos/ui_sid.cc
branches/amatthies/current/vice/src/arch/beos/vicemenu.cc
branches/amatthies/current/vice/src/arch/os2/ui.c
branches/amatthies/current/vice/src/arch/os2/vac++/incl/mainsrc.icc
branches/amatthies/current/vice/src/arch/os2/watcom/mainsrc.tgt
branches/amatthies/current/vice/src/arch/os2/watcom/vice.wpj
branches/amatthies/current/vice/src/arch/unix/archdep.c
branches/amatthies/current/vice/src/arch/unix/gp2x/make-bindist.sh
branches/amatthies/current/vice/src/arch/unix/gui/uipalemu.c
branches/amatthies/current/vice/src/arch/unix/joy.c
branches/amatthies/current/vice/src/arch/unix/macosx/Makefile.am
branches/amatthies/current/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am
branches/amatthies/current/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m
branches/amatthies/current/vice/src/arch/unix/macosx/cocoa/video.m
branches/amatthies/current/vice/src/arch/unix/sco_sol/make-bindist.sh
branches/amatthies/current/vice/src/arch/unix/skyos/make-bindist.sh
branches/amatthies/current/vice/src/arch/unix/tfearch.c
branches/amatthies/current/vice/src/arch/unix/x11/gnome/uipalcontrol.c
branches/amatthies/current/vice/src/arch/unix/x11/gnome/x11ui.c
branches/amatthies/current/vice/src/arch/win32/Makefile.am
branches/amatthies/current/vice/src/arch/win32/base.dsp
branches/amatthies/current/vice/src/arch/win32/c128ui.c
branches/amatthies/current/vice/src/arch/win32/kbd.c
branches/amatthies/current/vice/src/arch/win32/res.rc
branches/amatthies/current/vice/src/arch/win32/resc128.rc
branches/amatthies/current/vice/src/arch/win32/resc64.rc
branches/amatthies/current/vice/src/arch/win32/rescbm2.rc
branches/amatthies/current/vice/src/arch/win32/respet.rc
branches/amatthies/current/vice/src/arch/win32/resplus4.rc
branches/amatthies/current/vice/src/arch/win32/resvic20.rc
branches/amatthies/current/vice/src/arch/win32/ui.c
branches/amatthies/current/vice/src/arch/win32/uikeyboard.c
branches/amatthies/current/vice/src/arch/win32/vice.dsw
branches/amatthies/current/vice/src/arch/win32/watcom/base.tgt
branches/amatthies/current/vice/src/arch/win32/watcom/vice.wpj
branches/amatthies/current/vice/src/autostart.c
branches/amatthies/current/vice/src/autostart.h
branches/amatthies/current/vice/src/c128/c128-cmdline-options.c
branches/amatthies/current/vice/src/c128/c128mem.c
branches/amatthies/current/vice/src/c64/c64keyboard.c
branches/amatthies/current/vice/src/c64/c64mem.c
branches/amatthies/current/vice/src/c64/cart/stardos.c
branches/amatthies/current/vice/src/c64/digimax.c
branches/amatthies/current/vice/src/c64/ramcart.c
branches/amatthies/current/vice/src/c64/reu.c
branches/amatthies/current/vice/src/c64/tfe.c
branches/amatthies/current/vice/src/cbm2/cbm2mem.c
branches/amatthies/current/vice/src/gfxoutputdrv/bmpdrv.c
branches/amatthies/current/vice/src/init.c
branches/amatthies/current/vice/src/lib.c
branches/amatthies/current/vice/src/lib.h
branches/amatthies/current/vice/src/mem.h
branches/amatthies/current/vice/src/monitor/monitor.c
branches/amatthies/current/vice/src/pet/petmem.c
branches/amatthies/current/vice/src/pet/petsound.c
branches/amatthies/current/vice/src/plus4/plus4mem.c
branches/amatthies/current/vice/src/plus4/ted-sound.c
branches/amatthies/current/vice/src/screenshot.c
branches/amatthies/current/vice/src/sound.h
branches/amatthies/current/vice/src/translate.c
branches/amatthies/current/vice/src/translate.txt
branches/amatthies/current/vice/src/version.h
branches/amatthies/current/vice/src/vic20/vic20mem.c
branches/amatthies/current/vice/src/vic20/vic20sound.c
branches/amatthies/current/vice/src/vicii/vicii-badline.c
branches/amatthies/current/vice/src/vicii/vicii-draw.c
branches/amatthies/current/vice/src/vicii/vicii-fetch.c
branches/amatthies/current/vice/src/vicii/vicii-fetch.h
branches/amatthies/current/vice/src/vicii/vicii-mem.c
branches/amatthies/current/vice/src/vicii/vicii-sprites.c
branches/amatthies/current/vice/vice-mint.spec
branches/amatthies/current/vice/vice.spec
Added Paths:
-----------
branches/amatthies/current/svn-instructions.txt
branches/amatthies/current/vice/doc/GP2X-Howto.txt
branches/amatthies/current/vice/src/arch/win32/_vice.dsp
branches/amatthies/current/vice/src/clipboard.c
branches/amatthies/current/vice/src/clipboard.h
Removed Paths:
-------------
branches/amatthies/current/vice/src/arch/win32/_all.dsp
branches/amatthies/current/vice/src/arch/win32/vice.dsp
Property Changed:
----------------
branches/amatthies/current/vice/data/fonts/vice-cbm.bdf
branches/amatthies/current/vice/doc/html/hpux.html
branches/amatthies/current/vice/doc/html/qnx.html
branches/amatthies/current/vice/doc/html/sco.html
branches/amatthies/current/vice/src/c64/cart/actionreplay4.c
branches/amatthies/current/vice/src/c64/cart/actionreplay4.h
branches/amatthies/current/vice/src/c64/cart/stardos.c
branches/amatthies/current/vice/src/c64/cart/stardos.h
branches/amatthies/current/vice/vice-mint.spec
Copied: branches/amatthies/current/svn-instructions.txt (from rev 19094, tags/v2.0/v2.0/svn-instructions.txt)
===================================================================
--- branches/amatthies/current/svn-instructions.txt (rev 0)
+++ branches/amatthies/current/svn-instructions.txt 2008-08-01 21:32:15 UTC (rev 19095)
@@ -0,0 +1,373 @@
+
+Note that I am describing how to handle everything with a command-line
+SVN client. For GUI clients, it should be possible in a similar way.
+
+Additionally note that this is not a full introducion in Subversion, and
+it is not intended to be. Please, read the SVN book
+(http://svnbook.red-bean.com/) to get used to SVN.
+
+
+1. Reading the SVN repository
+=============================
+
+1.1 Naming scheme of releases:
+------------------------------
+
+The base name of the URL to retrieve working copies (cf. 1.2 below) is
+ https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/
+
+This will be called $BASE in the sequel.
+
+The naming for the releases is rather easy, but a little bit different
+from what you might be used to with SVN: First the trunk - that is,
+always the latest version - is named trunk. It can be found at
+
+ $BASE/trunk/
+
+All releases (developer releases as well a real releases) are put into
+'directories' at $BASE/tags/... . The main release name is next, and the
+developer releases is last. Here are some examples:
+
+ v1.13: $BASE/tags/v1.13/v1.13/
+ v1.13.5: $BASE/tags/v1.13/v1.13.5/
+ v1.22: $BASE/tags/v1.22/v1.22/
+ v1.22.9: $BASE/tags/v1.22/v1.22.9/
+
+Note that with the v0.xx releases, the main version had three numbers in
+it, thus:
+
+ v0.14.0: $BASE/tags/v0.14.0/v0.14.0/
+ v0.14.1: $BASE/tags/v0.14.1/v0.14.1/
+ v0.14.1.5: $BASE/tags/v0.14.1/v0.14.1.5/
+
+
+There are exceptions to this rule, though. These are:
+
+ v1.0.0.1: $BASE/tags/v1.0/v1.0.0.1/
+ v1.0.0.2: $BASE/tags/v1.0/v1.0.0.2/
+
+ (these two versions are the only ones of v1.xxx where the numbering
+ scheme of v0.xxx was still used)
+
+Additionally, there are the following releases:
+ v1.9a: $BASE/tags/v1.9/v1.9a/
+ v1.11-old: $BASE/tags/v1.11/v1.11-old/
+ v1.13a: $BASE/tags/v1.13/v1.13a/
+
+These are because releases v1.9 and v1.13 were replaced with their "a"
+counterparts shortly after release. v1.11-old was never released, but it
+was planned to release that one.
+
+Additionally note that there have been v0.14.2.74 and v0.14.2.75;
+unfortunately, I do not have these, only a patch from v0.14.2.74 ->
+v0.14.2.75, which is not sufficient to recreate these old ones, as the
+patches v0.14.2.73 -> v0.14.2.74 as well as the patch v0.14.2.75 ->
+v0.15.0 are missing, too.
+
+
+The directory "devel" is used for development work. In branches/,
+every user should create his own working directory with his name (spiro,
+andreasm, tibor, ...). In this directory, additional directories are
+created that resemble actual work.
+
+In tags/, every user should have his own working directory, too
+(names spiro, andreasm, tibor, ...). In this directories, tags are
+applied that resemble some milestones in development. For example, these
+tags are the basis for integration in the next developer release.
+
+
+
+Whenever you are in doubt about the directory structure, it might be a
+good idea to have a look into the online browseable directory on
+SourceForge:
+
+ http://vice-emu.svn.sourceforge.net/viewvc/vice-emu/tags/
+
+or the complete repository:
+
+ http://vice-emu.svn.sourceforge.net/viewvc/vice-emu/
+
+You can also use the "svn ls" command to see the contents of a
+directory. For example,
+
+$ svn ls https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/
+
+will print out everything that is in the tags/ subdirectory.
+
+
+
+1.2. Initial checkout
+---------------------
+
+If you want to start working on VICE, you first have to check out a
+working version of VICE. For example, to get the latest version of VICE,
+just enter:
+
+~/$ svn co https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/trunk/ vice
+
+This will check out the "trunk" version of VICE - that is, always the
+latest - into a new directory called vice (last parameter). If you want
+to get a different version (for example, v1.22.3), just change the URL
+part of the command to:
+
+https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.22/v1.22.3
+
+That is, the full command is:
+
+~/$ svn co https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.22/v1.22.3 vice
+
+to put everything into a new directory named "vice".
+
+
+
+1.3. Changing your workspace to another release
+-----------------------------------------------
+
+Sometimes, it might be convenient to be able to change your working copy
+to the one from another release. For example, you are hunting for the
+release where a certain bug was introduced. Of course, you can always
+check out specific releases (cf. 1.2). Unfortunately, this will always
+pull ALL files from the server, which takes time and network bandwidth.
+
+Instead, you might want to change a specific directory to another one.
+This can be done with the "svn switch" statement. Take, for example, you
+want to change to v1.20.5. You can do this with:
+
+~/vice$ svn switch https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.20/v1.20.5
+
+Note that you must be IN the directory where you previously checked out
+VICE!
+
+You can switch multiple times, as you want to. Note that any changed
+file will get the timestamp of the time this file was written while
+switching. This is to ensure (as good as possible) that the Makefile
+will recognize the changes, so you will be able to compile from that
+working set as soon as possible.
+
+You can switch back to the trunk using:
+
+~/vice$ svn switch https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/trunk/
+
+
+Note: If you have made local changes, svn switch will try to merge your
+changes into your working set.
+
+
+1.4. Reverting your workspace to what is on the server
+------------------------------------------------------
+
+Take that you have made changed to your workspace and compiled files.
+Now, you want to delete all files that are not under version control.
+The following file outputs these extra files to be deleted:
+
+~/vice$ svn status --no-ignore|sed -n -e "s/^[I|\?]//p"|xargs -n 1 echo rm -rf --
+
+If you run this command, it will output every file not under control,
+prepended by "rm -rf --". If you are really sure these files are all ok,
+you can delete them by removing the "echo" there.
+
+NOTE: THIS COMMAND DOES NOT HANDLE ALL CASES CORRECTLY! For example,
+files with SPACES will not be handled correctly. I would never recommend
+to use this command without actually having a look at what is to be
+deleted beforehand. USE AT YOUR OWN RISK!
+
+
+Another thing often encountered is that you have made some changes which
+you do not like anymore. For this, you can undo the changes made with
+the command:
+
+~/vice$ svn revert <PATHTOFILE>
+
+This will undo the local change completely, and you will have a copy of
+what is on the server.
+
+If you want to revert anything done, use
+
+~/vice$ svn revert --recursive .
+
+to revert everything in the current directory and its sub-directories.
+
+
+1.5 Get the newest version from the server
+------------------------------------------
+
+If someone has done any changes on the repository, you might want to get
+the latest changes. For this, you can use the "svn update" command which
+will retrieve the latest versions of all the files from the server.
+
+If you want to know beforehand what has changed, the "svn status"
+command is helpful.
+
+For both commands, have a look at the SVN book, or to the online help
+(svn --help update, for example, or info sed on Unixoid machines).
+
+
+
+2. Making your changes
+======================
+
+If you want to start development, you have to perform the following
+steps:
+
+a. Create your own workspace in a branch
+b. Change to this branch
+c. Make you local changes
+d. Commit your local changes
+e. repeat steps c. and d. as often as you like
+
+
+2.1. Creating your own workspace
+--------------------------------
+
+Whenever you want to make a change to VICE, you should perform these
+steps in your own branch. For this, generate a copy of the latest
+version. For this, generate a branch to work on:
+
+~/$ svn copy https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/v1.22/v1.22.10 https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/branches/spiro/v1.22.10-MYFEATURE
+
+This is too long for you? If you are in a working copy, you can also
+abbreviate this:
+
+~/vice$ svn copy tags/v1.22/v1.22.10 branches/spiro/v1.22.10-MYFEATURE
+
+Of course, replace my name "spiro" with you own, and replace the version
+(v1.22, v1.22.10) with the latest version, and replace MYFEATURE with
+something that makes more sense - that is, with what you are doing.
+
+The above naming would be equivalent to what was named
+spiro-1.22.10-MYFEATURE.diff with our old naming scheme.
+
+
+Make sure you have generated your own working directory before
+performing the above step, however. That is, for the first time you want
+to create a branch, you have to perform:
+
+
+~/vice$ svn mkdir branches/spiro
+
+or
+
+~/$ svn mkdir https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/branches/spiro
+
+Note that you must give a revision message; that is, a message where you
+are describing what you have done. You can do this either after pressing
+enter, or append it directly to the command:
+
+~/vice$ svn mkdir branches/spiro -m "Generated Spiro's working branch"
+
+
+NOTE: While one may be tempted to use the trunk to branch from, I would
+not recommend it here. The reason is simple: The maintainer might
+already be doing some integration work on the trunk, in which case you
+would branch from an intermediate version, which might not be a good
+idea. Additionally, it is harder (but not impossible) to find out from
+which version you just branched off if you do it from the branch. So, it
+is better to use the tags to branch from!
+
+
+2.2 Changing to your working branch
+-----------------------------------
+
+Now, either checkout a new working copy (cf. 1.2) or revert your current
+one (cf. 1.3.):
+
+~/$ svn co https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/branches/spiro/v1.22.10-MYFEATURE/
+
+or
+
+~/vice$ svn switch branches/spiro/v1.22.10-MYFEATURE/
+
+
+2.3 Make your local changes
+---------------------------
+
+Yes - now, you are allowed to do whatevery you like in your working
+copy. Change the VICE code any way you like it.
+
+There are some commands which might be helpful, however:
+
+- svn status - let's you find out which files you have changed locally
+- svn diff - you can do a diff against the version of the server,
+ so you can find out what you have changed in the
+ meantime in detail.
+
+
+2.4 Commit you local changes
+----------------------------
+
+This is the important step. As long as you do not commit, no one will be
+able to see what you have changed.
+
+It is best to start with a
+
+~/vice$ svn status
+
+which will show you which files you have changed.
+
+Files which are prepended with an "?" are the files which are not under
+version control yet. If you have added some files, these will be shown
+with the "?". Now, you must add them:
+
+~/vice$ svn add NEWFILE
+
+The same applies for the directories, by the way.
+
+Again, these changes will not show up until you commit:
+
+~/vice$ svn commit
+
+You will be asked for your log message, which you should enter here.
+
+
+2.5 Marking milestones
+----------------------
+
+Whenever you have a milestone reached, you can tag the current version.
+Additionally, if you want your latest changes to be included in the next
+official version of VICE, you MUST tag the current version. A tag is
+just a convenient way to remember the state you were working on.
+
+To create a tag, you must create a (virtual) copy of your current
+workspace. First, make sure you have committed any changes (by issuing a
+"cvs status" command). Then, tag your workspace by:
+
+~/vice$ svn copy branches/spiro/v1.22.10-MYFEATURE tags/spiro/v1.22.10-MYFEATURE
+
+(you can use the full URL, too)
+
+You can append numbers to the "MYFEATURE" if you want to have multiple
+milestones.
+
+
+If you want the feature to be added for the next release, just write a
+mail on the mailing list, mentioning the full path to the tag.
+
+
+
+3. Some maintainance work documentation
+=======================================
+
+(to be continued, just some snippets so far)
+
+3.1 Creating a source distribution
+----------------------------------
+
+a. Add all patches to be included
+b. Change the version number of the distribution in configure.in,
+ VICE_VERSION_MAJOR, VICE_VERSION_MINOR, VICE_VERSION_BUILD. Also,
+ define/undefine UNSTABLE there if this is a release, or not.
+c. Add entries in ChangeLog, src/ChangeLog
+d. Execute: autoreconf; ./configure; make dist
+e. svn commit
+f. svn copy https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/trunk/ https://vice-emu.svn.sourceforge.net/svnroot/vice-emu/tags/vX.YY/vX.YY.ZZ
+g. copy vice-X.YY.ZZ to viceteam.org/devel/
+
+
+
+4. Misc
+=======
+
+Make sure that the code you change:
+- has proper line endings (svn properties set correctly)
+- only uses C style comments (/* ... */), not C++ style - at least for
+ platform independant ("common") code.
Modified: branches/amatthies/current/vice/ChangeLog
===================================================================
--- branches/amatthies/current/vice/ChangeLog 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/ChangeLog 2008-08-01 21:32:15 UTC (rev 19095)
@@ -1,3 +1,80 @@
+2008-07-18 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 2.0
+
+2008-07-18 Christian Vogelgsang <ch...@vo...>
+
+ * build/macosx/build-vice-release.sh: use provided autogen.sh
+
+ * doc/ReadmeMacOSX.txt: updated mac docs
+
+ * doc/html/macosx.html: Prepared for release of 2.0
+
+2008-07-17 Spiro Trikaliotis <spi...@gm...>
+
+ * doc/vice.texi, doc/html/plain/NEWS, doc/html/index.html,
+ doc/Win32-Cygwin-HOWTO.txt: Prepared for upcoming 2.0 release.
+
+2008-07-16 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.27
+
+2008-07-15 Marco van den Heuvel <bla...@ya...>
+
+ * Makefile.am: Reverted the skyos make bindist(zip) part back to
+ what is used to be.
+
+2008-07-14 Marco van den Heuvel <bla...@ya...>
+
+ * README: Updated for the 2.0 release.
+
+2008-07-13 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.26
+
+2008-07-12 Marco van den Heuvel <bla...@ya...>
+
+ * build/riscos/build-cross.sh: Added a missing 'cd ..'.
+
+ * configure.in: Corrected a typo.
+
+ * doc/Readme.beos: Updated.
+
+ * vice-mint.spec, vice.spec: Release version updated to 2.0.
+
+2008-07-10 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.25
+
+2008-07-07 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.24
+
+2008-07-07 Marco van den Heuvel <bla...@ya...>
+
+ * doc/html/plain/NEWS: Updated.
+
+2008-07-04 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.23
+
+2008-07-04 Spiro Trikaliotis <spi...@gm...>
+
+ * Makefile.am: Make sure the file Doxyfile is included in the
+ distribution.
+
+ * doc/html/Makefile.am: Make sure the files hpux.html and
+ sco.html are included in the distribution.
+
+2008-07-01 Marco van den Heuvel <bla...@ya...>
+
+ * doc/GP2X-Howto.txt, doc/Makefile.am: Added a GP2X compile
+ howto text file.
+
+2008-07-02 Andreas Matthies <and...@gm...>
+
+ * doc/html/plain/BUGS, NEWS: Updated.
+
2008-07-01 Spiro Trikaliotis <spi...@gm...>
* Version 1.22.22
Modified: branches/amatthies/current/vice/Makefile.am
===================================================================
--- branches/amatthies/current/vice/Makefile.am 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/Makefile.am 2008-08-01 21:32:15 UTC (rev 19095)
@@ -2,7 +2,14 @@
SUBDIRS = $(POSUB) src build data man doc
-EXTRA_DIST = AUTHORS FEEDBACK COPYING INSTALL NEWS vice.spec vice-mint.spec
+EXTRA_DIST = AUTHORS \
+ FEEDBACK \
+ COPYING \
+ Doxyfile \
+ INSTALL \
+ NEWS \
+ vice.spec \
+ vice-mint.spec
.PHONY: x64 x128 xvic xpet xplus4 xcbm2
x64:
@@ -68,10 +75,10 @@
if UNIX_SKYOS_COMPILE
bindist:
- $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) nozip $(top_srcdir) $(MAKE)
+ $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) nozip $(top_srcdir)
bindistzip:
- $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) zip $(top_srcdir) $(MAKE)
+ $(SHELL) @ARCH_SRC_DIR@/skyos/make-bindist.sh $(STRIP) $(VICE_VERSION) $(prefix) zip $(top_srcdir)
endif
if UNIX_QNX6_COMPILE
Modified: branches/amatthies/current/vice/README
===================================================================
--- branches/amatthies/current/vice/README 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/README 2008-08-01 21:32:15 UTC (rev 19095)
@@ -1,5 +1,5 @@
- VICE 1.22 Aug 2007
+ VICE 2.0 Jul 2008
_______________
Modified: branches/amatthies/current/vice/build/macosx/build-vice-release.sh
===================================================================
--- branches/amatthies/current/vice/build/macosx/build-vice-release.sh 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/build/macosx/build-vice-release.sh 2008-08-01 21:32:15 UTC (rev 19095)
@@ -96,13 +96,8 @@
# configure snapshot
echo "configuring new source tree"
-(cd "$SRC_DIR/src/resid" && aclocal && automake && autoconf) >/dev/null 2>&1
+(cd "$SRC_DIR" && ./autogen.sh)
if [ $? != 0 ]; then
- echo "ERROR: configuring resid..."
- exit 1
-fi
-(cd "$SRC_DIR" && aclocal && autoheader && automake --add-missing && autoconf) >/dev/null 2>&1
-if [ $? != 0 ]; then
echo "ERROR: configuring VICE..."
exit 1
fi
Modified: branches/amatthies/current/vice/build/riscos/build-cross.sh
===================================================================
--- branches/amatthies/current/vice/build/riscos/build-cross.sh 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/build/riscos/build-cross.sh 2008-08-01 21:32:15 UTC (rev 19095)
@@ -127,4 +127,5 @@
ln -s arch/riscos/config.h config.h
make
+cd ..
make bindistzip
Modified: branches/amatthies/current/vice/configure.in
===================================================================
--- branches/amatthies/current/vice/configure.in 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/configure.in 2008-08-01 21:32:15 UTC (rev 19095)
@@ -7,15 +7,15 @@
AC_INIT(src/maincpu.c)
-VICE_VERSION_MAJOR=1
-VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=22
+VICE_VERSION_MAJOR=2
+VICE_VERSION_MINOR=0
+VICE_VERSION_BUILD=0
AC_SUBST(VICE_VERSION_MAJOR)
AC_SUBST(VICE_VERSION_MINOR)
AC_SUBST(VICE_VERSION_BUILD)
-AC_DEFINE(UNSTABLE,,[Define if this version is unstable.])
+dnl AC_DEFINE(UNSTABLE,,[Define if this version is unstable.])
if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
VICE_VERSION=$VICE_VERSION_MAJOR"."$VICE_VERSION_MINOR
@@ -125,7 +125,7 @@
if test x"$host_os" = "xminix"; then
AC_DEFINE(MINIX_SUPPORT,,[do we need minix support])
CFLAGS="$CFLAGS -D_MINIX -D_POSIX_SOURCE"
- MINIX_RELEASE=`uname -s`
+ MINIX_RELEASE=`uname -r`
MINIX_VERSION=`uname -v`
if test x"$MINIX_RELEASE" != "x3"; then
AC_MSG_ERROR([VICE works only on minix 3 and up])
Property changes on: branches/amatthies/current/vice/data/fonts/vice-cbm.bdf
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:eol-style
+ native
Copied: branches/amatthies/current/vice/doc/GP2X-Howto.txt (from rev 19094, tags/v2.0/v2.0/vice/doc/GP2X-Howto.txt)
===================================================================
--- branches/amatthies/current/vice/doc/GP2X-Howto.txt (rev 0)
+++ branches/amatthies/current/vice/doc/GP2X-Howto.txt 2008-08-01 21:32:15 UTC (rev 19095)
@@ -0,0 +1,27 @@
+This document describes how to compile the GP2X port.
+
+
+First of all you will need to install DevkitGP2X, and make sure the
+cross-toolchain binaries are in the PATH.
+
+After installing DevkitGP2X you will need to copy or make links for the
+following files:
+
+arm-linux-ar to arm-gp2x-linux-ar
+arm-linux-g++ to arm-gp2x-linux=g++
+arm-linux-gcc to arm-gp2x-linux-gcc
+arm-linux-ranlib to arm-gp2x-linux-ranlib
+arm-linux-strip to arm-gp2x-linux-strip
+
+After doing this you will be able to use the --host configure option for
+VICE to have it build the GP2X port. In other words, you just use:
+
+./configure --host=arm-gp2x-linux
+
+And the configure script will try to find and use the correct
+cross-toolchain (arm-gp2x-linux-*), and set the correct CFLAGS and LDFLAGS
+for the GP2X port.
+
+After the compile is done you can use 'make bindist' to create a binary
+distribution directory, or use 'make bindistzip' to create a binary
+distribution zip archive.
Modified: branches/amatthies/current/vice/doc/Makefile.am
===================================================================
--- branches/amatthies/current/vice/doc/Makefile.am 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/Makefile.am 2008-08-01 21:32:15 UTC (rev 19095)
@@ -17,7 +17,8 @@
cartconv.txt \
iec-bus.txt \
mon.txt \
- openGLsync-howto.txt
+ openGLsync-howto.txt \
+ GP2X-Howto.txt
info_TEXINFOS = vice.texi
Modified: branches/amatthies/current/vice/doc/Readme.beos
===================================================================
--- branches/amatthies/current/vice/doc/Readme.beos 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/Readme.beos 2008-08-01 21:32:15 UTC (rev 19095)
@@ -3,11 +3,8 @@
REQUIREMENTS
---------------------------
-BeVICE was developed and so far tested under BeOS 5 Personal Edition
-on a quite fast machine (Pentium II 400MHz) with Soundblaster 64 PCI
-and two standard analog joysticks on a Y-cable.
-I'm highly interested in experiences with other hardware and BeOS
-releases (see FEEDBACK)
+BeVICE was developed and so far tested under BeOS 5 Personal Edition,
+Zeta and Haiku.
INSTALLATION
------------------------
@@ -47,7 +44,6 @@
specific setting are missing; use commandline options or
edit the vice.ini.
- Fullsrceen mode is needed.
-- No binaries for PPC so far.
FEEDBACK
------------------
@@ -56,4 +52,5 @@
mailto:vic...@fi...
or directly to BeOS porter
mailto:and...@gm...
-
+or BeOS maintainer
+ mailto:bla...@ya...
Modified: branches/amatthies/current/vice/doc/ReadmeMacOSX.txt
===================================================================
--- branches/amatthies/current/vice/doc/ReadmeMacOSX.txt 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/ReadmeMacOSX.txt 2008-08-01 21:32:15 UTC (rev 19095)
@@ -1,9 +1,9 @@
-MacOS X Port of VICE
+Mac OS X Port of VICE
====================
This document contains information relevant for the Mac OS X Port of VICE.
-This official MacOS X Port is maintained by
+This official Mac OS X Port is maintained by
Christian Vogelgsang <ch...@vo...>
@@ -11,35 +11,48 @@
--------
1. Installation
- 2. Usage
- 3. Building VICE
- 4. Feedback
+ 2. Usage of Gtk+/X11 Port
+ 3. Usage of Cocoa Port
+ 4. Joystick Support
+ 5. Building VICE
+ 6. Feedback
1. Installation
---------------
-1.1 Install X11
-Make sure to have X11.app installed on your Mac. It is provided on your Mac
+1.1 Choose Port
+
+The VICE Emulators for Macs are distributed in three versions that use
+different UI front ends: native Cocoa, X11/Xaw, and, Gtk+. The first one
+directly uses the well known Mac user interface. The other ones are based on
+the X11 Window System that is available additionally for Mac OS X.
+
+X11/Xaw is based on the original X11 interface of VICE and is very light but
+with limited UI interface. The second one is based on the Gtk+ widget library
+and has a feature rich UI with pull-down menus. Xaw is a slim port that needs
+no non-system extra libraries, Gtk+ requires a large set of external libs and
+thus is quite large.
+
+The ports are named with *-cocoa-*, *-x11-*, or *-gtk-* in the distribution
+archive name.
+
+The X11/Xaw and Gtk+ are complete ports, i.e. all features available on other
+systems are available and all emulators are included. The Cocoa port is still
+under construction and thus considered "experimental". It does not include all
+features available and some emulators are not complete.
+
+
+1.2 Install X11 (Only for X11/Xaw and Gtk+ Port)
+
+Make sure you have X11.app installed on your Mac. It is provided on your Mac
OSX install CD/DVD (at least on Mac OS X 10.4 or later) and often not
installed by default. Click on the corresponding "X11.pkg" to install it. On
newer systems there is an "Optional Installs.pkg" installer that allows to
install X11 in the "Custom Installation" section.
-1.2 Choose Version
-The VICE Emulators for Macs are distributed in two versions that use different
-UI front ends: X11 or Gtk+. The first one is based on the original X11
-interface of VICE and is very light. The second one is based on the Gtk+
-widget library and has a feature rich UI with pull-down menus.
-
-X11 is a slim port that needs no non-system extra libraries, Gtk+ requires a
-large set of external libs and thus is quite large.
-
-The two ports are named with *-x11-* or *-gtk-* in the distribution archive
-name.
-
1.3 Install Application
The Mac OS X port is distributed as a disk image *.dmg. Just click on the
@@ -47,8 +60,11 @@
disk image to your hard disk. Just create a new VICE directory in your
applications folder (/Applications) and copy all files there.
-1.4 Create Bundles for each Emulator
+If you like, you can move the Application binaries anywhere you want.
+
+1.4 Create Bundles for each Emulator (Optional; Only for X11/Xaw and Gtk+ Port)
+
The VICE distribution contains a single application bundle called VICE. If you
run this one by double clicking on it then it will ask which emulator to run.
@@ -61,6 +77,7 @@
The separate emulator application bundles are not distributed in the release
dmg to save download time and server space.
+
1.5 Setup Command Line Tools
You can use the emulators and some additional tools (e.g. c1541, cardconv,
@@ -73,8 +90,10 @@
The command line emulators are launched with a helper script that calls the
binary embedded in the VICE.app application bundle. It is important to keep
the VICE.app bundle in the directory directly next to the "tools" directory
-otherwise the command line emulators will not run.
+otherwise the command line emulators will not run. Similarly, the Cocoa port
+needs the emulator App bundle in the same directory.
+
1.6 Network Setup
This port of VICE supports the ethernet emulation available in some emulators
@@ -98,10 +117,15 @@
libpcap-source distribution. Download from http://www.tcpdump.org and have a
look at libpcap/README.macosx.
+Unfortunately, the WLAN adapter (usually device en1) on portable Macs does not
+support libpcap packet capturing (as of 10.4 and 10.5). So TFE emulation on a
+wireless network adapter may not work. Use the ethernet port instead.
-2. Usage
---------
+
+2. Usage of Gtk+ and X11/Xaw Ports
+----------------------------------
+
2.1 Run VICE Bundle
Simply run the emulator suite by clicking on the VICE.app icon. A chooser
@@ -109,15 +133,19 @@
to launch an emulator directly then see section 1.4 for creating separate
bundles for each emulator.
-The VICE Bundle supports a simple style of drag and drop: You can launch the
+On start up the bundle will first open a terminal window (xterm) for the VICE
+log messages and then the screen windows for the virtual displays.
+
+The VICE bundles support a simple style of drag and drop: You can launch the
emulator by dragging a disk image (*.d64 *.d71 *.d81) or a program file (*.prg
*.p00) on the bundle icon. This will smart-attach the given binary and launch
the emulator. If the emulator is already running then drag and drop does not
work.
-On start up the bundle will first open a terminal window (xterm) for the VICE
-log messages and then the screen windows for the virtual displays.
+Also, an emulator bundle will register the typical file types (see above) and
+then you can simply click on a disk image directly to launch it in VICE.
+
2.2 Run from Command Line
First add the "tools" directory to your PATH (see section 1.5) in your
@@ -125,10 +153,11 @@
script in "tools" (e.g. x64, x128...). Any arguments passed to the launcher
are directly forwarded to the emulator binary.
-On start up the launcher ensures that the X11 environment is available and
-redirects all console output directly to the console. An additional xterm
-window for log messages is not opened.
+For the Gtk+ and X11/Xaw ports on start up the launcher ensures that the X11
+environment is available and redirects all console output directly to the
+console. An additional xterm window for log messages is not opened.
+
2.3 Use the X11 UI
The X11 UI is very light and only presents the virtual display in a window
@@ -151,6 +180,7 @@
Have a look at the official VICE manuals for an in-depth description of the
available commands and options.
+
2.4 Use the Gtk+ UI
The Gtk+ UI is much more user-friendly. An emulator window with a pull-down
@@ -164,8 +194,9 @@
Have a look at the official VICE manuals for an in-depth description of the
available commands and options.
-2.5 Keyboard Mapping
+2.5 Keyboard Mapping in Gtk+/X11
+
The keyboard mapping on X11 (and on your Mac) is done as follows:
1. Map raw key code of your keyboard to X11 key code with Xmodmap
@@ -183,7 +214,7 @@
choosing a file or by selecting a predefined one. Predefined symbolic and
positional mappings are available.
-The symbolic mapping assigns the pressed Mac key to the same labeled key on
+The 'symbolic mapping' assigns the pressed Mac key to the same labeled key on
the virtual cbm keyboard. So pressing F1 on the Mac presses F1 on the emulated
machine. It also does automatic shifting/unshifting, e.g. pressing F2 on the
Mac results in a virtual shift press and a virtual key F1 press (i.e. F2 is
@@ -205,12 +236,12 @@
Left Arrow Underscore (_)
Up Arrow Tilde (~) Backtick (`) Grave (^)
-The positional mappings try to map the physical location of a key on the Mac
+The 'positional mappings' try to map the physical location of a key on the Mac
keyboard to a virtual key at a similar position. E.g. your top and leftmost
key will be the top and leftmost key on your virtual machine. Unfortunately,
this mapping does not work always as expected: It relies heavily on the
national layout of your keymap. Furthermore, the physical layout of Mac and
-VICE machine do not match exactly so positional mapping will always be an
+VICE machine do not match exactly, so positional mapping will always be an
approximation. This can be even more complicate if you use different key
mappings on your Mac.
@@ -220,8 +251,56 @@
keys to control software features". The hardware controls are then accessed by
pressing F1-F12 + Fn key.
-2.6 Joystick Support
+
+3. Usage of Cocoa Port
+----------------------
+
+Note: The Cocoa port is still "experimental", i.e. it is not full featured and
+some things may be missing. This holds for the documentation as well ;)
+
+3.1 Features
+
+ * native Mac OS X user interface with modeless dialogs
+ * any-size/fullscreen OpenGL accelerated rendering
+ * multi-threaded emulation core
+
+
+3.2 Current State
+
+ * x64 90% complete, runs with UI and most menus and dialogs.
+
+ * All other emus: binaries are available, no menus and dialogs.
+ Use CMD+Q to quit such an emulator and drag&drop to attach disk images.
+ Some keyboard mappings already work, others not.
+
+
+3.3 Known Issues
+
+ * The Resource Inspector lacks correct input cells. All values have to
+ be entered as strings.
+ * Some Menu entries are not greyed out but still do nothing.
+
+
+3.4 Key Mapping
+
+The key mapping show the Mac key on a US extended mapping and the right one is
+the emulated Commodore key. Special keys are marked with <Symbol>.
+
+ § (Paragraph) <LEFT ARROW>
+ <Tab> <CONTROL>
+ ` (Backtick), Left Alt/Ctrl <CBM>
+ <ESC> <RUN/STOP>
+ <Backspace> <DEL>
+ <F9>, <PgDown> <POUND>
+ <F10>, <PgUp> <UP ARROW>
+ <F11>, <Home> <CLR/HOME>
+ <F12> <RESTORE>
+
+
+4. Joystick Support
+-------------------
+
The Mac ports has support for USB joysticks. It requires a generic USB HID
joystick device which is supported by most joystick models. Every button of
the joystick is mapped to the single virtual fire button in the emulator. The
@@ -242,14 +321,15 @@
should work with other models as well.
-3. Building VICE
+5. Building VICE
----------------
This section is only relevant if you want to compile an own distribution of
VICE from the source code.
-3.1 XCode
+5.1 XCode
+
If you wan to compile VICE yourself then you first need to install Apple's
XCode Development kit. It is available on your Mac OS X Installation DVD or
can be downloaded for free (after registration) from the Apple Developer
@@ -260,10 +340,11 @@
XCode itself is not required but the command line tools (compiler, linker...)
and other development files (SDKs).
-3.2 Required Tools
-The following tools are required or optional for a successfull VICE build:
+5.2 Required Tools
+The following tools are required or optional for a successful VICE build:
+
- Platypus (Optional)
http://www.sveinbjorn.org/platypus
@@ -276,8 +357,9 @@
script does not support drag and drop and quits immediately afert start up
(i.e. the VICE application icon disappears after the launch)!
-3.3 Required Library Sources
+5.3 Required Library Sources
+
VICE for Macs relies on a number of external libraries. You have to get their
source code as they are missing on a default Mac system. Some libs are
optional, i.e. if they are available then some extra features of VICE are
@@ -317,8 +399,9 @@
lame-3.97.tar.gz http://lame.sourceforge.net/
svn tree at svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-svn
-3.4 Building Required Libraries
+5.4 Building Required Libraries
+
First, build all external libraries. The VICE source distribution contains
build scripts to automatically perform this step.
@@ -342,8 +425,9 @@
If all went well then the libraries are compiled and installed in the "extlib"
directory. The libraries are now ready for the VICE build.
-3.5 Building VICE
+5.5 Building VICE
+
The build process of VICE contains the following steps: Call "configure" in
the source tree to determine the required "make" system setup and find
available libs. Then compile the source tree to get binaries of all emulators
@@ -399,7 +483,7 @@
disk image found in the "TEMP/x11/ub/" directory.
-4. Feedback
+6. Feedback
-----------
If you discover problems not listed above or just want to tell us your
Modified: branches/amatthies/current/vice/doc/Win32-Cygwin-HOWTO.txt
===================================================================
--- branches/amatthies/current/vice/doc/Win32-Cygwin-HOWTO.txt 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/Win32-Cygwin-HOWTO.txt 2008-08-01 21:32:15 UTC (rev 19095)
@@ -13,7 +13,7 @@
dependencies.
2. Obtain a copy of the VICE sources. Extract the vice-x.xx directory into
- your Cygwin user's home directory (e.g. /home/Owner/vice-1.22).
+ your Cygwin user's home directory (e.g. /home/Owner/vice-2.0).
3. Obtain DirectX 7 header files and libraries. It doesn't look like
Microsoft still makes this distribution available for download from its
@@ -46,7 +46,7 @@
make bindist
to make an executable distribution, which will appear in a directory
- called e.g. /home/Owner/vice-1.22/src/WinVICE-1.22. For development
+ called e.g. /home/Owner/vice-2.0/src/WinVICE-2.0. For development
purposes, no further installation is necessary; you can run the
executables directly from this directory.
Modified: branches/amatthies/current/vice/doc/html/Makefile.am
===================================================================
--- branches/amatthies/current/vice/doc/html/Makefile.am 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/html/Makefile.am 2008-08-01 21:32:15 UTC (rev 19095)
@@ -9,6 +9,7 @@
images/new.gif \
images/vice-logo.jpg \
index.html \
+ hpux.html \
macosx.html \
plain/64doc.txt \
plain/BUGS \
@@ -21,6 +22,7 @@
plain/drive_info.txt \
plain/serial.txt \
qnx.html \
+ sco.html \
solaris.html \
vice_1.html \
vice_2.html \
Modified: branches/amatthies/current/vice/doc/html/hpux.html
===================================================================
--- branches/amatthies/current/vice/doc/html/hpux.html 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/html/hpux.html 2008-08-01 21:32:15 UTC (rev 19095)
@@ -1,77 +1,77 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>The VICE Emulator</title>
-</head>
-
-<body text="#000000" bgcolor="#FFFFFF">
-
-<hr>
-
-<center>
-<img SRC="images/vice-logo.jpg" ALT="The VICE" align=CENTER>
-</center>
-
-<hr>
-<br>
-
-<b>VICE</b> is a program that runs on a Unix, MS-DOS, Win32, OS/2,
-Acorn RISC OS, BeOS, QNX 4.x, QNX 6.x, Amiga, GP2X, SkyOS or
-Mac OS X machine and executes programs intended for the old 8-bit
-computers. The current version emulates the C64, the C128, the VIC20,
-almost all PET models, the PLUS4 and the CBM-II (aka C610).
-
-<h2>
-Download VICE for HPUX based systems
-</h2>
-
-You can download the latest VICE distributions for HPUX systems here.
-Some distributions may not be available at the release date.
-
-<p>
-
-<li>
-<b>Source</b> distributions:
-</li>
-
-<ul>
-<li>
-Tarball:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz">vice-2.0.tar.gz</a>
-</li>
-</ul>
-
-<p>
-
-<li>
-New <b>binary</b> distributions:
-</li>
-
-<ul>
-
-<li>
-Binary for <b>HPPA HPUX</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-v2.0-hppa-11.11.depot.gz">vice-v2.0-hppa-11.11.depot.gz</a>.
-To be installed with the depot installer.
-</li>
-
-<li>
-Binary for <b>IA64 HPUX</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-v2.0-ia64-11.31.depot.gz">vice-v2.0-ia64-11.31.depot.gz</a>.
-To be installed with the depot installer.
-</li>
-
-</ul>
-
-The files are taken from
-
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE">http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE</a>.
-
-<br><br>
-
-For more information visit the <a href="index.html">main page</a>.
-
-</body>
-
-</html>
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>The VICE Emulator</title>
+</head>
+
+<body text="#000000" bgcolor="#FFFFFF">
+
+<hr>
+
+<center>
+<img SRC="images/vice-logo.jpg" ALT="The VICE" align=CENTER>
+</center>
+
+<hr>
+<br>
+
+<b>VICE</b> is a program that runs on a Unix, MS-DOS, Win32, OS/2,
+Acorn RISC OS, BeOS, QNX 4.x, QNX 6.x, Amiga, GP2X, SkyOS or
+Mac OS X machine and executes programs intended for the old 8-bit
+computers. The current version emulates the C64, the C128, the VIC20,
+almost all PET models, the PLUS4 and the CBM-II (aka C610).
+
+<h2>
+Download VICE for HPUX based systems
+</h2>
+
+You can download the latest VICE distributions for HPUX systems here.
+Some distributions may not be available at the release date.
+
+<p>
+
+<li>
+<b>Source</b> distributions:
+</li>
+
+<ul>
+<li>
+Tarball:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz">vice-2.0.tar.gz</a>
+</li>
+</ul>
+
+<p>
+
+<li>
+New <b>binary</b> distributions:
+</li>
+
+<ul>
+
+<li>
+Binary for <b>HPPA HPUX</b> systems:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-v2.0-hppa-11.11.depot.gz">vice-v2.0-hppa-11.11.depot.gz</a>.
+To be installed with the depot installer.
+</li>
+
+<li>
+Binary for <b>IA64 HPUX</b> systems:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-v2.0-ia64-11.31.depot.gz">vice-v2.0-ia64-11.31.depot.gz</a>.
+To be installed with the depot installer.
+</li>
+
+</ul>
+
+The files are taken from
+
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE">http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE</a>.
+
+<br><br>
+
+For more information visit the <a href="index.html">main page</a>.
+
+</body>
+
+</html>
Property changes on: branches/amatthies/current/vice/doc/html/hpux.html
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:mime-type
+ text/html
Added: svn:eol-style
+ native
Modified: branches/amatthies/current/vice/doc/html/index.html
===================================================================
--- branches/amatthies/current/vice/doc/html/index.html 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/html/index.html 2008-08-01 21:32:15 UTC (rev 19095)
@@ -461,6 +461,11 @@
<a NAME="contact">Contacts
</h1>
+<p>VICE has moved its source repository to public services provided by
+<a href="http://sf.net/">SourceForge</a>. You can find it at <a
+href="http://sf.net/projects/vice-emu">http://sf.net/projects/vice-emu</a>.
+We like to thank the SourceForge staff for that help.</p>
+
<p>Before contacting us, have a look at the
<a href="http://vicekb.trikaliotis.net/">VICE knowledge base</a> if your
question is answered there. Keep in mind
@@ -473,8 +478,13 @@
<ul>
<li>
-Generic questions, bug reports, suggestions etc.: The Vice team
-(<a href="mailto:vic...@fi...">vic...@fi...</a>)
+Bug reports, suggestions, support requests should be directed to the
+SourceForge trackers at <a
+ href="http://sourceforge.net/tracker/?group_id=223021">http://sourceforge.net/tracker/?group_id=223021</a>.
+This way, you, the users, and we, the developers, can track what has
+been reported and what has been already fixed. Ideally, also sent the
+report to the mailing address of the Vice team at (<a
+ href="mailto:vic...@fi...">vic...@fi...</a>).
</li>
</ul>
Modified: branches/amatthies/current/vice/doc/html/macosx.html
===================================================================
--- branches/amatthies/current/vice/doc/html/macosx.html 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/html/macosx.html 2008-08-01 21:32:15 UTC (rev 19095)
@@ -43,7 +43,7 @@
On Intel Macs: Requires at least Mac OS X <b>10.4</b>
</li>
<li>
-<b>X11.app</b> Version 1.0 from Extra Installs on Mac OS X DVD
+<b>X11.app</b> Version 1.0 from Extra Installs on Mac OS X DVD for X11 and Gtk+ port.
</li>
</ul>
@@ -56,7 +56,7 @@
<ul>
<li>
Tarball:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-1.22.tar.gz">vice-1.22.tar.gz</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz">vice-2.0.tar.gz</a>
</li>
</ul>
@@ -70,12 +70,12 @@
<li>
Universal Binary for <b>X11 Athena Widgets UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-1.22.dmg">vice-macosx-x11-ub-1.22.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-2.0.dmg">vice-macosx-x11-ub-2.0.dmg</a>
</li>
<li>
Universal Binary for <b>X11 Gtk+ UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-1.22.dmg">vice-macosx-gtk-ub-1.22.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-2.0.dmg">vice-macosx-gtk-ub-2.0.dmg</a>
</li>
</ul>
@@ -87,7 +87,7 @@
<ul>
<li>
Universal Binary for <b>native Cocoa UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-cocoa-ub-1.22.dmg">vice-macosx-cocoa-ub-1.22.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-cocoa-ub-2.0.dmg">vice-macosx-cocoa-ub-2.0.dmg</a>
<p><b>Note:</b> The Cocoa Port is not complete yet. The archive contains a runnable x64 with a subset of the upcoming features.
This binary is a technical preview of the new port and no full featured release of VICE. Please choose the X11/Athena or X11/Gtk+ port
for a complete Mac release.</p>
@@ -102,14 +102,20 @@
<li>
Universal Binary for <b>X11 Athena Widgets UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-1.21.dmg">vice-macosx-x11-ub-1.21.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-1.22.dmg">vice-macosx-x11-ub-1.22.dmg</a>
</li>
<li>
Universal Binary for <b>X11 Gtk+ UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-1.21.dmg">vice-macosx-gtk-ub-1.21.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-1.22.dmg">vice-macosx-gtk-ub-1.22.dmg</a>
</li>
+<li>
+Universal Binary for <b>native Cocoa UI</b>:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-cocoa-ub-1.22.dmg">vice-macosx-gtk-ub-1.22.dmg</a>
+
+</li>
+
</ul>
The files are taken from
Modified: branches/amatthies/current/vice/doc/html/plain/BUGS
===================================================================
--- branches/amatthies/current/vice/doc/html/plain/BUGS 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/html/plain/BUGS 2008-08-01 21:32:15 UTC (rev 19095)
@@ -1,3 +1,6 @@
+- IRQ acknowledge handling is buggy. Visible in e.g.
+ Charlatan/Beyond Force, Enforcer, Bandits (VIC20).
+
- Xaw UI context popup menu for drive attach is broken if more than
two drives are active.
Modified: branches/amatthies/current/vice/doc/html/plain/NEWS
===================================================================
--- branches/amatthies/current/vice/doc/html/plain/NEWS 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/html/plain/NEWS 2008-08-01 21:32:15 UTC (rev 19095)
@@ -11,6 +11,12 @@
** General
----------
+- VICE development has moved to public services:
+ http://sf.net/projects/vice-emu
+ You can read the latest development in the Subversion
+ repository, file bug reports, and similar things.
+ Check it out!
+
- New Openserver 5.x, Openserver 6.x and Unixware ports.
- New AROS64 port.
@@ -41,6 +47,19 @@
- Improved REU compatibility
+- Fixed CPU timing bug introduced in 1.22 (demo "Borderless").
+
+- Fixed bugs in the CIA emulation (demo "So-phisticated",
+ W. Lorenz testsuite).
+
+- Fixed various bugs in VIC-II emulation: Sprite x-positioning,
+ Latch X/Y, video mode changes, DEN bit handling, raster IRQ,
+ NTSC sprites and sprites in full/debugging border mode (list
+ of fixed demos/games too long to mention here).
+
+- RESTORE key is handled differently now, fixing an NMI bug
+ because the NMI was asserted too long before.
+
** VIC20 changes
----------------
@@ -78,15 +97,32 @@
- Fixed mouse grab and xaw menu popup.
+- After a CPU jam user can select to resume emulation without
+ reset.
+
** MS-Windows changes
---------------------
- Fixed the reverse logic of the -confirmexit/+confirmexit and
-singlecpu/+singlecpu command-line options.
-- allow for pasting into the VICE window: Either via menu
- (Edit/Paste), or by right-clicking on the VICE window.
+- Added the ability to copy and paste text from and to the
+ VICE window.
+- Added the ability to paste text into the VICE window by
+ right-clicking on the VICE window.
+
+- Keyboard shortcuts are definable in the configuration file
+ win_shortscuts.vsc
+
+- After a CPU jam user can select to resume emulation without
+ reset.
+
+- Fixed volume slider behaviour when switching fullscreen mode.
+
+- Key repeat is eliminated OS-wise. This way, the RESTORE key is
+ not used with autorepeat.
+
** BeOS changes
---------------
@@ -99,12 +135,27 @@
- Added warning dialog when the monitor is accessed without
having an open console window.
+- Added the ability to copy and paste text from and to the
+ VICE window.
+
** AmigaOS changes
------------------
- Fixed the reverse logic of the -confirmexit/+confirmexit
command-line options.
+- Added the ability to copy and paste text from and to the
+ VICE window.
+
+- After a CPU jam user can select to resume emulation without
+ reset.
+
+** OS/2 changes
+---------------
+
+- After a CPU jam user can select to resume emulation without
+ reset.
+
** Miscellaneous changes
------------------------
@@ -120,7 +171,9 @@
- New memmap feature which allows tracking of memory accesses,
activated by the configure option --enable-memmap.
+- Fixed bug in ffmpeg/FFV1 driver. Should be really lossless now.
+
* Changes in VICE 1.22
======================
Modified: branches/amatthies/current/vice/doc/html/qnx.html
===================================================================
--- branches/amatthies/current/vice/doc/html/qnx.html 2008-08-01 20:07:22 UTC (rev 19094)
+++ branches/amatthies/current/vice/doc/html/qnx.html 2008-08-01 21:32:15 UTC (rev 19095)
@@ -1,91 +1,91 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>The VICE Emulator</title>
-</head>
-
-<body text="#000000" bgcolor="#FFFFFF">
-
-<hr>
-
-<center>
-<img SRC="images/vice-logo.jpg" ALT="The VICE" align=CENTER>
-</center>
-
-<hr>
-<br>
-
-<b>VICE</b> is a program that runs on a Unix, MS-DOS, Win32, OS/2,
-Acorn RISC OS, BeOS, QNX 4.x, QNX 6.x, Amiga, GP2X, SkyOS or
-Mac OS X machine and executes programs intended for the old 8-bit
-computers. The current version emulates the C64, the C128, the VIC20,
-almost all PET models, the PLUS4 and the CBM-II (aka C610).
-
-<h2>
-Download VICE for QNX systems
-</h2>
-
-You can download the latest VICE distributions for QNX systems here.
-Some distributions may not be available at the release date.
-
-<p>
-
-<li>
-<b>Source</b> distributions:
-</li>
-
-<ul>
-<li>
-Tarball:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz">vice-2.0.tar.gz</a>
-</li>
-</ul>
-
-<p>
-
-<li>
-New <b>binary</b> distributions:
-</li>
-
-<ul>
-
-<li>
-Binary for <b>x86 QNX 4.x</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0-qnx4.tar.F">vice-2.0-qnx4.tar.F</a>.
-to be installed with the QNX 4.x installer.
-</li>
-
-<li>
-Binary for <b>x86 QNX 6.x</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/VICE-2.0-x86-public.qpr">VICE-2.0-x86-public.qpr</a>.
-To be installed with the QNX 6.x installer.
-</li>
-
-</ul>
-
-<li>
-Old <b>binary</b> distributions:
-</li>
-
-<ul>
-
-<li>
-Binary for <b>x86 QNX 6.x</b> systems:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/VICE-1.22-x86-public.qpr">VICE-1.22-x86-public.qpr</a>.
-To be installed with the QNX 6.x installer.
-</li>
-
-</ul>
-
-The files are taken from
-
-<a href=...
[truncated message content] |