ivtools-2.0.8

Author: vectaport

CHANGES/CHANGES-2.0

@@ -1,3 +1,7 @@
+December 28th 2021 ivtools-2.0.8
+
+* fourth attempt at a release that might build with homebrew
+
 December 27th 2021 ivtools-2.0.7
 
 * third attempt at a release that might build with homebrew

INSTALL

@@ -2,7 +2,7 @@
 			INSTALL for ivtools-2.0
 
 
-Instructions for building ivtools-2.0.7 from source, the short version:
+Instructions for building ivtools-2.0.8 from source, the short version:
 
         cp Makefile.orig Makefile // if cloned from github
 	./configure
@@ -38,7 +38,7 @@ Instructions for building ivtools-2.0.7 from source, the short version:
 - Scott Johnston, May-June 2020
 
 
-Instructions for building ivtools-2.0.7 from source, the long version:
+Instructions for building ivtools-2.0.8 from source, the long version:
 
 0. Compilation Environment
 

Imakefile

@@ -17,7 +17,7 @@ MakeInSubdirsTop($(SUBDIRS))
 imake::
 	-@if [ ! -f ./imake ]; then \
 	echo building and installing ./imake; \
-	gcc src/imake/imake.c -o imake; \
+	gcc -I$(XINCDIR) src/imake/imake.c -o imake; \
 	fi
 
 clean::

Makefile.orig

@@ -65,9 +65,9 @@ DEPDRAWSERV = $(IVTOOLSSRC)/DrawServ/$(CPU)/libDrawServ.$(VERSION).dylib
 
    PROJECTDIR = /proj
 
-   RELEASE = ivtools-2.0.7
+   RELEASE = ivtools-2.0.8
 
-   VERSION = 2.0.7
+   VERSION = 2.0.8
 
    REPOSITORY_FILES = *.c *.cc *.cxx *.C *.h Imakefile *.def template README INSTALL VERSION MANIFEST COPYRIGHT ANNOUNCE README.ivmkcm *.patch *.bugfix.? *.script *.sed comutil.arg comterp.err comutil.ci comterp.arg comterp.ci site.def.SUN4 site.def.LINUX site.def.SGI site.def.HP800 site.def.ALPHA site.def.CYGWIN site.def.NETBSD site.def.FREEBSD WishList *.defaults *.cf HOWTO Copyright *.sh CHANGES CHANGES-0.? CHANGES-1.? *.cpp ivmkmf *.bash *.1 *.3 config.guess config.sub configure configure.in MANIFEST.perceps MANIFEST.comterp *.mk config.mk.in *.tmpl *.flt *.m4 config.defs.in
 
@@ -299,12 +299,7 @@ PACKAGE = top_ivtools
 WORLDOPTS =
 SUBDIRS = src config
 
-CPU:
-	-@if [ ! -f /usr/local/bin/imake ]; then \
-	echo building and installing /usr/local/bin/imake; \
-	gcc src/imake/imake.c; \
-	sudo install -c -m 0755 a.out /usr/local/bin/imake; \
-	rm a.out; fi
+CPU: imake
 	@$(SHELL) $(SCRIPTSRC)/cpu.sh $(CONFIGSRC)/arch.def
 
 World::
@@ -600,7 +595,7 @@ cmcommit::
 	done
 
 imake::
-	-@if [ ! -f ./imake ]; then  	echo building and installing ./imake;  	gcc src/imake/imake.c -o imake;  	fi
+	-@if [ ! -f ./imake ]; then  	echo building and installing ./imake;  	gcc -I$(XINCDIR) src/imake/imake.c -o imake;  	fi
 
 clean::
 	@$(RM_CMD) make.makefile make.makefiles make.depend make.make make.imake

README

@@ -2,7 +2,7 @@
 			README for ivtools 2.0
 
 
-This directory contains a release of ivtools 2.0.7.  You should read
+This directory contains a release of ivtools 2.0.8.  You should read
 the rest of this file for information on what ivtools is and the
 INSTALL file for instructions on how to build it.
 

VERSION

@@ -1 +1 @@
-Release 2.0.7
+Release 2.0.8

config/params.def

@@ -27,7 +27,7 @@
  * Name of the software release
  */
 #ifndef Release
-#define	Release ivtools-2.0.7
+#define	Release ivtools-2.0.8
 #endif
 
    RELEASE = Release
@@ -36,7 +36,7 @@
  * VersionNumber
  */
 #ifndef Version
-#define	Version 2.0.7
+#define	Version 2.0.8
 #endif
 
    VERSION = Version

config/rules.def

@@ -19,12 +19,7 @@
  */
 #ifndef MakeCPU
 #define MakeCPU()							@@\
-CPU:									@@\
-	-@if [ ! -f /usr/local/bin/imake ]; then \			@@\
-	echo building and installing /usr/local/bin/imake; \ 		@@\
-	gcc src/imake/imake.c; \					@@\
-	sudo install -c -m 0755 a.out /usr/local/bin/imake; \		@@\
-	rm a.out; fi 	   	      					@@\
+CPU: imake								@@\
 	@$(SHELL) $(SCRIPTSRC)/cpu.sh $(CONFIGSRC)/arch.def
 #endif
 

configure

@@ -5071,8 +5071,8 @@ echo writing \"XCONFIGDIR = $x_libraries/X11/config\"
 echo XCONFIGDIR = $x_libraries/X11/config >config/config.mk
 echo writing \"ABSTOP = `pwd`\"
 echo ABSTOP = `pwd` >>config/config.mk
-echo writing \"CPU = `make CPU XINCLUDES=$x_includes`\"
-echo CPU = `make CPU XINCLUDES=$x_includes` >>config/config.mk
+echo writing \"CPU = `make CPU XINCDIR=$x_includes`\"
+echo CPU = `make CPU XINCDIR=$x_includes` >>config/config.mk
 echo writing \"LIBSTDCPLUSPLUS2 = $LIBSTDCPLUSPLUS2\"
 echo LIBSTDCPLUSPLUS2 = $LIBSTDCPLUSPLUS2 >>config/config.mk
 echo writing \"LIBSTDCPLUSPLUS3 = $LIBSTDCPLUSPLUS3\"

src/include/ivstd/version.h

@@ -1,3 +1,3 @@
-#define IvtoolsVersion 2.0.7
-#define VersionString "2.0.7"
-#define ReleaseString "ivtools-2.0.7"
+#define IvtoolsVersion 2.0.8
+#define VersionString "2.0.8"
+#define ReleaseString "ivtools-2.0.8"