From 75c47c98429f4ccfe18fbe24a20a063007d26732 Mon Sep 17 00:00:00 2001 From: Olaf Seibert Date: Wed, 22 Jul 2015 00:31:27 +0200 Subject: [PATCH] Rename the build executable for ITS to kn10-ks-its. That should hopefully make it easier to install all versions in parallel in the same directory, with less duplication. --- doc/install.txt | 6 +++--- doc/usage.txt | 14 +++++++------- src/Makefile.mk | 16 +++++++++++----- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/doc/install.txt b/doc/install.txt index 558be0b..bf3e7f2 100644 --- a/doc/install.txt +++ b/doc/install.txt @@ -220,9 +220,9 @@ BUILDING FROM SOURCES Target Builds this emulator ------ -------------------- - base-kl kn10-kl (KL10B - runs TOPS-10/20) - base-ks kn10-ks (KS10 - runs TOPS-10/20) - base-ks-its kn10-ks (KS10 - runs ITS) + base-kl kn10-kl (KL10B - runs TOPS-10/20) + base-ks kn10-ks (KS10 - runs TOPS-10/20) + base-ks-its kn10-ks-its (KS10 - runs ITS) Let's suppose the platform is FreeBSD-i386 for example: diff --git a/doc/usage.txt b/doc/usage.txt index d8025d1..875173e 100644 --- a/doc/usage.txt +++ b/doc/usage.txt @@ -16,14 +16,14 @@ KLH10 STARTUP: - A KLH10 installation has several binaries; the one you want to -start is normally called either "kn10-ks" or "kn10-kl" depending on -the version you have built. These should all be installed in a KLH10 -"home directory" and you should be connected to that directory (see -the file "install.txt" if necessary). Then simply give the following -shell command: + A KLH10 installation has several binaries; the one you want to start +is normally called either "kn10-ks", "kn10-ks-its" or "kn10-kl" depending +on the version you have built. These should all be installed in a KLH10 +"home directory" and you should be connected to that directory (see the +file "install.txt" if necessary). Then simply give the following shell +command: - % ./kn10-kl ; or ./kn10-ks + % ./kn10-kl ; or ./kn10-ks or ./kn10-ks-its The KN10 process will start up, allocate and clear KN10 memory, and begin reading commands from the default file "klh10.ini". If you wish diff --git a/src/Makefile.mk b/src/Makefile.mk index 89d6ab8..20621a8 100644 --- a/src/Makefile.mk +++ b/src/Makefile.mk @@ -79,7 +79,7 @@ usage: @echo 'Normally the target is one of these 3 base configs:' @echo ' base-kl KL10 version for TOPS (kn10-kl and utils)' @echo ' base-ks KS10 version for TOPS (kn10-ks and utils)' - @echo ' base-ks-its KS10 version for ITS (kn10-ks and utils)' + @echo ' base-ks-its KS10 version for ITS (kn10-ks-its and utils)' @echo 'Or these utilities:' @echo ' tapedd Tape copy & conversion' @echo ' vdkfmt Virtual disk copy & conversion' @@ -129,7 +129,7 @@ showdefs: # Don't flush these files if interrupted. # Currently no intermediate source files are generated, so # this can be empty, but hang on to last binary anyway. -.PRECIOUS: kn10-ks kn10-kl +.PRECIOUS: kn10-ks kn10-ks-its kn10-kl ####################################################################### @@ -232,6 +232,9 @@ DINTFLAGS = \ kn10-ks: $(OFILES_KS) $(LINKER) $(LDFLAGS) $(LDOUTF) kn10-ks $(OFILES_KS) $(LIBS) +kn10-ks-its: $(OFILES_KS) + $(LINKER) $(LDFLAGS) $(LDOUTF) kn10-ks-its $(OFILES_KS) $(LIBS) + kn10-kl: $(OFILES_KL) $(LINKER) $(LDFLAGS) $(LDOUTF) kn10-kl $(OFILES_KL) $(LIBS) @@ -240,7 +243,7 @@ kn10-kl: $(OFILES_KL) ## Auxiliary action targets clean: - @rm -f kn10-ks kn10-kl *.o \ + @rm -f kn10-ks kn10-ks-its kn10-kl *.o \ $(DPROCS_KL) $(DPROCS_KS) $(DPROCS_KSITS) \ $(ALL_UTILS) @@ -253,6 +256,8 @@ install-unix: @-mkdir ${KLH10_HOME}/flushed @if [ -x ${KLH10_HOME}/kn10-ks ]; then \ mv ${KLH10_HOME}/kn10-ks ${KLH10_HOME}/flushed; fi + @if [ -x ${KLH10_HOME}/kn10-ks-its ]; then \ + mv ${KLH10_HOME}/kn10-ks-its ${KLH10_HOME}/flushed; fi @if [ -x ${KLH10_HOME}/kn10-kl ]; then \ mv ${KLH10_HOME}/kn10-kl ${KLH10_HOME}/flushed; fi @if [ -x ${KLH10_HOME}/dprpxx ]; then \ @@ -264,6 +269,7 @@ install-unix: @if [ -x ${KLH10_HOME}/dpimp ]; then \ mv ${KLH10_HOME}/dpimp ${KLH10_HOME}/flushed; fi @if [ -x kn10-ks ]; then cp -p kn10-ks ${KLH10_HOME}/; fi + @if [ -x kn10-ks-its ]; then cp -p kn10-ks-its ${KLH10_HOME}/; fi @if [ -x kn10-kl ]; then cp -p kn10-kl ${KLH10_HOME}/; fi @if [ -x dprpxx ]; then cp -p dprpxx ${KLH10_HOME}/; fi @if [ -x dptm03 ]; then cp -p dptm03 ${KLH10_HOME}/; fi @@ -287,7 +293,7 @@ install-unix: # Standard setup for KS ITS # base-ks-its: - $(MAKER) kn10-ks $(DPROCS_KSITS) $(BASE_UTILS) udlconv \ + $(MAKER) kn10-ks-its $(DPROCS_KSITS) $(BASE_UTILS) udlconv \ "SRC = $(SRC)" \ "CC = $(CC)" \ "CFLAGS = $(CFLAGS) $(CFLAGS_AUX)" \ @@ -388,7 +394,7 @@ base-kl: ## Lintish versions to see how many compiler warnings we can generate ## lint-ks-its: - $(MAKER) kn10-ks $(DPROCS_KSITS) $(BASE_UTILS) udlconv \ + $(MAKER) kn10-ks-its $(DPROCS_KSITS) $(BASE_UTILS) udlconv \ "SRC = $(SRC)" \ "CC = $(CC)" \ "CFLAGS = $(CFLAGS) $(CFLAGS_AUX) $(CFLAGS_LINT)" \