From 1760197fa46494453ce7d52f64264d3599edc174 Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Tue, 4 May 2010 01:21:50 +0300 Subject: [PATCH] Rename assemble.bat to assemble.jpcrrinit as its not DOS batch file --- BRIEF-INSTALLATION-INSTRUCTIONS | 8 ++++---- Changelog.utf8 | 5 +++-- assemble.bat => assemble.jpcrrinit | 0 build-files/BRIEF-INSTALLATION-INSTRUCTIONS | 6 +++--- build-files/dobuild.sh | 2 +- build-files/start-jpcrr.bat | 2 +- build-files/start-jpcrr.sh | 2 +- manual.lyx | 6 +++--- manual.txt | 6 +++--- org/jpc/j2se/JPCApplication.java | 2 +- 10 files changed, 20 insertions(+), 19 deletions(-) rename assemble.bat => assemble.jpcrrinit (100%) diff --git a/BRIEF-INSTALLATION-INSTRUCTIONS b/BRIEF-INSTALLATION-INSTRUCTIONS index db90750..b3fe77e 100644 --- a/BRIEF-INSTALLATION-INSTRUCTIONS +++ b/BRIEF-INSTALLATION-INSTRUCTIONS @@ -13,18 +13,18 @@ to rip those from. They are files bios.bin, vgabios.bin and floppy.img. 5) Launch the emulator -'java JPCApplication -library disklibrary -autoexec assemble.bat' +'java JPCApplication -library disklibrary -autoexec assemble.jpcrrinit' disklibrary is directory where disk images are found and stored (if it doesn't exist, it will be created). -assemble.bat contains reasonable set of initialization commands. +assemble.jpcrrinit contains reasonable set of initialization commands. If you run emulator from directory other than the source tree, then: -Set CLASSPATH to ':.' (Unix) or ';.' (Windows) - Replace 'disklibrary' with path to library directory. -- Replace 'assemble.bat' with path to corresponding file. +- Replace 'assemble.jpcrrinit' with path to corresponding file. First time you start, you may get complaint about being unable to find BIOS image. Just dismiss it. @@ -70,7 +70,7 @@ The emulator should now be set up (File->Assemble) 7) To relaunch the emulator, use the same command as in 4) -'java JPCApplication -library disklibrary -autoexec assemble.bat' +'java JPCApplication -library disklibrary -autoexec assemble.jpcrrinit' Replace parameters with appropriate values if needed (and set CLASSPATH if needed, see 4)). diff --git a/Changelog.utf8 b/Changelog.utf8 index f47d5c1..82be60e 100644 --- a/Changelog.utf8 +++ b/Changelog.utf8 @@ -1,6 +1,7 @@ -Changes since JPC-RR Release 10.5: -================================== +Changes from JPC-RR Release 10.5 to JPC-RR Release 10.6: +======================================================== - Fix fast typing (keyhit) mode. +- Rename assemble.bat to assemble.jpcrrinit as its not DOS batch file. Changes from JPC-RR Release 10.4 to JPC-RR Release 10.5: ======================================================== diff --git a/assemble.bat b/assemble.jpcrrinit similarity index 100% rename from assemble.bat rename to assemble.jpcrrinit diff --git a/build-files/BRIEF-INSTALLATION-INSTRUCTIONS b/build-files/BRIEF-INSTALLATION-INSTRUCTIONS index 44d4298..fc01c1f 100644 --- a/build-files/BRIEF-INSTALLATION-INSTRUCTIONS +++ b/build-files/BRIEF-INSTALLATION-INSTRUCTIONS @@ -14,11 +14,11 @@ to rip those from. They are files bios.bin, vgabios.bin and floppy.img. Set CLASSPATH to point to jpcrr JAR and possibly other locations if you want to add some extensions. -'java -jar jpcrr-.jar -library disklibrary -autoexec assemble.bat' +'java -jar jpcrr-.jar -library disklibrary -autoexec assemble.jpcrrinit' disklibrary is directory where disk images are found and stored (if it doesn't exist, it will be created). -assemble.bat contains reasonable set of initialization commands. +assemble.jpcrrinit contains reasonable set of initialization commands. First time you start, you may get complaint about being unable to find BIOS image. Just dismiss it. @@ -64,7 +64,7 @@ The emulator should now be set up (File->Assemble) 7) To relaunch the emulator, use the same command as in 4) -'java -jar jpcrr-.jar -library disklibrary -autoexec assemble.bat' +'java -jar jpcrr-.jar -library disklibrary -autoexec assemble.jpcrrinit' Replace parameters with appropriate values if needed (and set CLASSPATH if needed, see 4)). diff --git a/build-files/dobuild.sh b/build-files/dobuild.sh index a2a3cc7..9dc3156 100755 --- a/build-files/dobuild.sh +++ b/build-files/dobuild.sh @@ -9,7 +9,7 @@ unzip sources.zip && cp src/build-files/BRIEF-INSTALLATION-INSTRUCTIONS . && cp src/build-files/start-jpcrr.bat . && cp src/build-files/start-jpcrr.sh . && -cp src/assemble.bat . && +cp src/assemble.jpcrrinit . && cp src/extramenu . && cp src/manual.txt . && cp src/luakernel.lua . && diff --git a/build-files/start-jpcrr.bat b/build-files/start-jpcrr.bat index 7d2426e..2c0a7ce 100644 --- a/build-files/start-jpcrr.bat +++ b/build-files/start-jpcrr.bat @@ -1 +1 @@ -java -jar jpcrr-r10.5.jar -library disklibrary -autoexec assemble.bat +java -jar jpcrr-r10.6.jar -library disklibrary -autoexec assemble.jpcrrinit diff --git a/build-files/start-jpcrr.sh b/build-files/start-jpcrr.sh index 807bbf3..cf072eb 100755 --- a/build-files/start-jpcrr.sh +++ b/build-files/start-jpcrr.sh @@ -1,2 +1,2 @@ #!/bin/sh -java -jar jpcrr-r10.5.jar -library disklibrary -autoexec assemble.bat +java -jar jpcrr-r10.6.jar -library disklibrary -autoexec assemble.jpcrrinit diff --git a/manual.lyx b/manual.lyx index 9af14ae..001f16f 100644 --- a/manual.lyx +++ b/manual.lyx @@ -117,13 +117,13 @@ Running emulator \end_layout \begin_layout Standard -There is premade autoexec script called assemble.bat that has fairly reasonable - defaults. +There is premade autoexec script called assemble.jpcrrinit that has fairly + reasonable defaults. To use it: \end_layout \begin_layout LyX-Code -java JPCApplication -library library -autoexec assemble.bat +java JPCApplication -library library -autoexec assemble.jpcrrinit \end_layout \begin_layout Standard diff --git a/manual.txt b/manual.txt index 452edf0..9c01230 100644 --- a/manual.txt +++ b/manual.txt @@ -31,10 +31,10 @@ images (ignore the error about no BIOS images being found). 2.4 Running emulator -There is premade autoexec script called assemble.bat that has -fairly reasonable defaults. To use it: +There is premade autoexec script called assemble.jpcrrinit that +has fairly reasonable defaults. To use it: -java JPCApplication -library library -autoexec assemble.bat +java JPCApplication -library library -autoexec assemble.jpcrrinit The “-library library” specifies that contents of directory 'library' are to be used as library. The script pops up settings diff --git a/org/jpc/j2se/JPCApplication.java b/org/jpc/j2se/JPCApplication.java index 590249e..aeb9307 100644 --- a/org/jpc/j2se/JPCApplication.java +++ b/org/jpc/j2se/JPCApplication.java @@ -223,7 +223,7 @@ public class JPCApplication System.err.println("Warning: System Look-and-Feel not loaded" + e.getMessage()); } - System.out.println("JPC-RR: Rerecording PC emulator based on JPC PC emulator. Release 10.5"); + System.out.println("JPC-RR: Rerecording PC emulator based on JPC PC emulator. Release 10.6"); System.out.println("Revision: " + getRevision()); System.out.println("Based on JPC PC emulator."); System.out.println("Copyright (C) 2007-2009 Isis Innovation Limited"); -- 2.11.4.GIT