Merge branch 'release/v.10.7.4' into develop

Author: newlisp

Makefile

@@ -8,8 +8,6 @@
 # Note! on some systems do 'gmake' instead of 'make' (most BSD)
 #
 # for 'make install' you have to login as 'root' else do 'make install_home'
-# note that 'make install_home' will not install guiserver files which
-# must be in /usr/local/share/newlisp in MacOX X and UNIX machines
 #
 # to make the distribution archive:  'make dist'
 #
@@ -24,8 +22,8 @@
 # and file LOCALIZATION for details
 #
 
-VERSION = 10.7.3
-INT_VERSION = 10703
+VERSION = 10.7.4
+INT_VERSION = 10704
 
 default: makefile_build
 	make -f makefile_build
@@ -49,19 +47,18 @@ help:
 	@echo "  make test            # same as 'make check' but less output"
 	@echo "  make testall         # run an extended test suite with less output"
 	@echo "  make version         # replace version number in several files after changing in Makefile"
-	@echo "  make bench           # benchmark relative to 32-bit Mac OS 10.5 on MacMini 1.83Ghz"
+	@echo "  make bench           # run qa-bench compare to aprevious macOS version on specific hardware"
 	@echo "  make dist            # make a source distribution .tgz package "
 	@echo "  make android_dist    # make a source package for Android NDK compilation"
 	@echo "  make android_dist_utf8  # make a source package for Android NDK compilationi utf8"
 	@echo
 	@echo "Note! on some systems use gmake instead of make."
 	@echo "Note! not all makefiles are listed in this help, specifically 64-bit versions."
 	@echo " "
-	@echo "Readline is for commandline editing support and requires libreadline and headerfiles."
-	@echo "Not all makefiles contain libreadline support, but is easy to add (see other makefieles)."
-	@echo "If there is no UTF-8 option for your OS, consult makefile_xxx."
+	@echo "make files distinguish beteween os support and compilation with or without"
+	@echo "    lib readline support, 64bit v 32bit support, utf-8 support, extended function import interface
 	@echo " "
-	@echo "For more customization options (exe dir, install dir, 64-biti, etc) see the file doc/INSTALL"
+	@echo "For other customization options (exe dir, install dir,  etc) see the file doc/INSTALL"
 
 # make newlisp.exe and newlisp.dll on a MinGW, MSYS system
 # also needs the installer NSYS installed
@@ -102,82 +99,19 @@ winall64_utf8:
 	./newlisp qa-dot
 	tar czvf newlisp-win64-utf8.tgz newlisp.exe newlisp.dll
 
-# make a Windows installer package
-wings:
-	make -f makefile_wings
-	
-wings64:
-	make -f makefile_wings64
-	
-
-# scripts for making UBUNTU linux packages
-
-dpkg:
-	make clean
-	cp makefile_original_install makefile_install
-	make -f makefile_linuxLP64_ffi
-	cp util/description-pak .
-	sudo checkinstall --nodoc --maintainer "lutz@nuevatec.com" --pkgrelease 1 --default
-	rm description-pak
-	mv *.deb ../Desktop
-
-dpkg_utf8:
-	make clean
-	cp makefile_original_install makefile_install
-	make -f makefile_linuxLP64_utf8_ffi
-	cp util/description-pak .
-	sudo checkinstall --nodoc --maintainer "lutz@nuevatec.com" --pkgrelease utf8 --default
-	rm description-pak
-	mv *.deb ../Desktop
-
-# scripts for making Mac OS X disk image installers
-# makefile_darwin_package needs a previous /Applications/newLISP-GS.app
-dmg_ppc:
-	make clean
-	make -f makefile_darwin_utf8_leopardPPC_ffi 
-	make -f makefile_darwin_package
-	hdiutil create -srcfolder newLISP-image newlisp-$(VERSION)-OSX-ppc.dmg
-	mv newlisp-$(VERSION)-OSX-ppc.dmg ..
-	sudo rm -rf Package_contents
-	sudo rm -rf newLISP-image
-
-# makefile_darwin_package needs a previous /Applications/newLISP-GS.app
-dmg_intel:
-	make clean
-	make -f makefile_darwinLP64_utf8_ffi
-	make -f makefile_darwin_package
-	hdiutil create -srcfolder newLISP-image newlisp-$(VERSION)-OSX-intel.dmg
-	mv newlisp-$(VERSION)-OSX-intel.dmg ..
-	sudo rm -rf Package_contents
-	sudo rm -rf newLISP-image
-
-# this cleans up the distribution directory for a clean build from scratch
-
 # this cleans the tree for a rebuild using the same configuration as before
 clean:
 	-rm -f *~ *.bak *.o *.obj *.map *.core core *.tgz *.txt TEST newlisp-universal
 	-rm -f newlisp-js*.*
 	-rm -rf newlisp-js-$(VERSION)
-	-rm -f guiserver/*.class */*~ */._*
 	-rm -f doc/*.bak util/*.bak examples/*.bak modules/*.bak
 	-chmod 644 *.h *.c Makefile makefile*
 	-chmod 755 configure configure-alt examples/*
 	-chmod 644 doc/* modules/*.lsp examples/*.lsp examples/*.html
 	-chmod 755 doc/index.cgi
-	-chmod 644 guiserver/*
-	-chmod 755 guiserver/index.cgi
-	-chmod 755 guiserver/images
-	-chmod 644 guiserver/images/*
-	-chmod 755 guiserver/images/index.cgi
-	-chmod 755 guiserver/java
-	-chmod 644 guiserver/java/*
-	-chmod 755 guiserver/java/index.cgi
 	-rm -f makefile_build makefile_install config.h test-*
 
 # run test scripts
-sharebug:
-	./newlisp qa-dot
-
 
 check:
 	./newlisp qa-dot
@@ -254,9 +188,6 @@ uninstall_home:
 # This makes the main newlisp-x.x.x.tgz source distribuition package
 dist: clean
 	-mkdir newlisp-$(VERSION)
-	-mkdir newlisp-$(VERSION)/guiserver
-	-mkdir newlisp-$(VERSION)/guiserver/images
-	-mkdir newlisp-$(VERSION)/guiserver/java
 	-mkdir newlisp-$(VERSION)/modules
 	-mkdir newlisp-$(VERSION)/examples
 	-mkdir newlisp-$(VERSION)/doc
@@ -272,7 +203,6 @@ dist: clean
 	cp doc/* newlisp-$(VERSION)/doc
 	cp util/* newlisp-$(VERSION)/util
 	cp qa-specific-tests/* newlisp-$(VERSION)/qa-specific-tests
-	cp -R guiserver/* newlisp-$(VERSION)/guiserver
 	cp -R newlisp-js/* newlisp-$(VERSION)/newlisp-js
 	tar czvf newlisp-$(VERSION).tgz newlisp-$(VERSION)/*
 	rm -rf newlisp-$(VERSION)
@@ -327,10 +257,6 @@ version:
 	sed -i.bak -E 's/newLISP\/[[:digit:]]+.[[:digit:]]+.[[:digit:]]+(-dev)?/newLISP\/$(VERSION)/' nl-web.c
 	sed -i.bak -E 's/newLISP v.+ Manual/newLISP v.$(VERSION) Manual/' doc/newlisp_manual.html
 	sed -i.bak -E 's/Reference v.+<\/h2>/Reference v.$(VERSION)<\/h2>/' doc/newlisp_manual.html
-	sed -i.bak -E 's/newlisp-.....-win/newlisp-$(INT_VERSION)-win/' guiserver/newlisp-gs.nsi
-	sed -i.bak -E 's/and newLISP .+ on /and newLISP $(VERSION) on /' guiserver/newlisp-gs.nsi
-	sed -i.bak -E 's/newlisp-.....-win/newlisp-$(INT_VERSION)-win/' guiserver/newlisp64-gs.nsi
-	sed -i.bak -E 's/and newLISP .+ on /and newLISP $(VERSION) on /' guiserver/newlisp64-gs.nsi
 	sed -i.bak -E 's/VERSION=.+/VERSION=$(VERSION)/' configure-alt
 	sed -i.bak -E 's/VERSION=.+/VERSION=$(VERSION)/' makefile_original_install 
 	sed -i.bak -E 's/VERSION=.+/VERSION=$(VERSION)/' makefile_darwin_package

README

@@ -1,5 +1,5 @@
-newLISP version 10.x.x for LINUX, FreeBSD, Mac OSX Solaris and Win32
-===================================================================
+newLISP version 10.x.x for LINUX, FreeBSD, macOS Solaris and Windows
+====================================================================
 
 
 INTRODUCTION

configure-alt

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PACKAGE=newlisp
-VERSION=10.7.3
+VERSION=10.7.4
 
 rm -f config.h makefile_build makefile_install
 
@@ -552,45 +552,6 @@ install:
 	-install -m 644 modules/unix.lsp \$(pkgdatadir)/modules/unix.lsp
 	-install -m 644 modules/xmlrpc-client.lsp \$(pkgdatadir)/modules/xmlrpc-client.lsp
 	-install -m 644 modules/zlib.lsp \$(pkgdatadir)/modules/zlib.lsp
-	# GUI-Server install
-	-install -d \$(pkgdatadir)/guiserver
-	-install -d \$(docdir)/guiserver
-	-install -m 755 guiserver/newlisp-edit.lsp \$(bindir)/newlisp-edit
-	-install -m 644 guiserver/guiserver.jar \$(pkgdatadir)/guiserver.jar
-	-install -m 644 guiserver/guiserver.lsp \$(pkgdatadir)/guiserver.lsp
-	-install -m 644 guiserver/images/newLISP128.png \$(pkgdatadir)/newLISP128.png
-	-install -m 644 guiserver/COPYING \$(docdir)/guiserver/COPYING
-	-install -m 644 guiserver/index.html \$(docdir)/guiserver/index.html
-	-install -m 644 guiserver/guiserver.lsp.html \$(docdir)/guiserver/guiserver.lsp.html
-	-install -m 644 util/newlispdoc.css \$(docdir)/guiserver/newlispdoc.css
-	-install -m 644 guiserver/allfonts-demo.lsp \$(pkgdatadir)/guiserver/allfonts-demo.lsp
-	-install -m 644 guiserver/animation-demo.lsp \$(pkgdatadir)/guiserver/animation-demo.lsp
-	-install -m 644 guiserver/border-layout-demo.lsp \$(pkgdatadir)/guiserver/border-layout-demo.lsp
-	-install -m 644 guiserver/button-demo.lsp \$(pkgdatadir)/guiserver/button-demo.lsp
-	-install -m 644 guiserver/clipboard-demo.lsp \$(pkgdatadir)/guiserver/clipboard-demo.lsp
-	-install -m 644 guiserver/cursor-demo.lsp \$(pkgdatadir)/guiserver/cursor-demo.lsp
-	-install -m 644 guiserver/drag-demo.lsp \$(pkgdatadir)/guiserver/drag-demo.lsp
-	-install -m 644 guiserver/font-demo.lsp \$(pkgdatadir)/guiserver/font-demo.lsp
-	-install -m 644 guiserver/frameless-demo.lsp \$(pkgdatadir)/guiserver/frameless-demo.lsp
-	-install -m 644 guiserver/html-demo.lsp \$(pkgdatadir)/guiserver/html-demo.lsp
-	-install -m 644 guiserver/image-demo.lsp \$(pkgdatadir)/guiserver/image-demo.lsp
-	-install -m 644 guiserver/midi-demo.lsp \$(pkgdatadir)/guiserver/midi-demo.lsp
-	-install -m 644 guiserver/midi2-demo.lsp \$(pkgdatadir)/guiserver/midi2-demo.lsp
-	-install -m 644 guiserver/mouse-demo.lsp \$(pkgdatadir)/guiserver/mouse-demo.lsp
-	-install -m 644 guiserver/move-resize-demo.lsp \$(pkgdatadir)/guiserver/move-resize-demo.lsp
-	-install -m 644 guiserver/pinballs-demo.lsp \$(pkgdatadir)/guiserver/pinballs-demo.lsp
-	-install -m 644 guiserver/properties-demo.lsp \$(pkgdatadir)/guiserver/properties-demo.lsp
-	-install -m 644 guiserver/rotation-demo.lsp \$(pkgdatadir)/guiserver/rotation-demo.lsp
-	-install -m 644 guiserver/shapes-demo.lsp \$(pkgdatadir)/guiserver/shapes-demo.lsp
-	-install -m 644 guiserver/sound-demo.lsp \$(pkgdatadir)/guiserver/sound-demo.lsp
-	-install -m 644 guiserver/stroke-demo.lsp \$(pkgdatadir)/guiserver/stroke-demo.lsp
-	-install -m 644 guiserver/tabs-demo.lsp \$(pkgdatadir)/guiserver/tabs-demo.lsp
-	-install -m 644 guiserver/table-demo.lsp \$(pkgdatadir)/guiserver/table-demo.lsp
-	-install -m 644 guiserver/textfield-demo.lsp \$(pkgdatadir)/guiserver/textfield-demo.lsp
-	-install -m 644 guiserver/textrot-demo.lsp \$(pkgdatadir)/guiserver/textrot-demo.lsp
-	-install -m 644 guiserver/widgets-demo.lsp \$(pkgdatadir)/guiserver/widgets-demo.lsp
-	-install -m 644 guiserver/word-count.lsp \$(pkgdatadir)/guiserver/word-count.lsp
-	-install -m 644 guiserver/uppercase.lsp \$(pkgdatadir)/guiserver/uppercase.lsp
 
 
 uninstall:

doc/CHANGES

@@ -7221,4 +7221,24 @@ Dec 6, 2009
    entire string is valid ASCII or UTF-8 with no 0s, ‘trim’ behaves 
    like in older versions.
 
+10.7.4
+   When starting newlisp in -http-safe server mode HTTP_PUT and HTTP_DELETE 
+   requests will not be served. This will cause 'write-file' and 'delete-file'
+   in url syntax, 'put-url' and 'delete-url' functions issued from a newLISP 
+   client to return the text message "Server in safe mode".
+
+   New file qa-specific-tests/qa-share.lsp .
+
+   New guiserver.jar v 1.67 compiled with java 1.6
+   Still problems on macOS, some unrelated to change to image/icon load change
+
+   Added REQUEST_URI to environment variables in webserver mode.
+
+   Removed code introduced in 10.7.2 to syncronize file poisitons of C FILE stream 
+   and raw file handle operations. Syncronization still seem s to work on cases
+   tested, but may not work in all cases mixing 'read-line' and 'seek'.
+
+   Changes for separately packaged Java Guiserver and elimination of installers.
+
+   (rotate theList -offsetOfRotation) was buggy
 

doc/CodePatterns.html

@@ -92,8 +92,8 @@
 
 <center>
 <h1 class="title">Code Patterns in newLISP<font size="-1">&#174;</font>
-</h1>Version 2017 Augusr 11<sup>th</sup><br/>
-<a href="http://newlisp.org">newLISP</a> v.10.7.3
+</h1>Version 2018 July 12<sup>th</sup><br/>
+<a href="http://newlisp.org">newLISP</a> v.10.7.4
 </center>
 
 <br/><br/><br/>
@@ -3690,7 +3690,7 @@ <h3>Extracting return values</h3>
 <tr><td> <tt>string</tt></td><td> <tt>(set 'string (get-string (foo x y z)</tt></td><td> <tt>return(char * string)</tt></td></tr>
 <tr><td> <tt>integer array</tt></td><td> <tt>(set 'numList (unpack "ld ld ld" (foo x y z)))</tt></td><td> <tt>return(int numList[])</tt></td></tr>
 <tr><td> <tt>float array</tt></td><td> <tt>(set 'numList (unpack "f f f" (foo x y z)))</tt></td><td> <tt>return(float numList[])</tt></td></tr>
-<tr><td> <tt>double array</tt></td><td> <tt>(set 'numList (unpack "lf lf lf") (foo x y z)))</tt></td><td> <tt>return(double numList[])</tt></td></tr>
+<tr><td> <tt>double array</tt></td><td> <tt>(set 'numList (unpack "lf lf lf" (foo x y z)))</tt></td><td> <tt>return(double numList[])</tt></td></tr>
 <tr><td> <tt>string array</tt></td><td> <tt>(set 'stringList (map get-string (unpack "ld ld ld" (foo x y z))))</tt></td><td><tt>return(char * string[])</tt></td></tr>
 </table>
 <p><tt>Floats</tt> and <tt>doubles</tt> can only be returned via address pointer references.</p>

doc/ExpressionEvaluation.html

@@ -78,7 +78,7 @@
 <blockquote>
 <center><h2>Expression evaluation, Implicit Indexing, Contexts and Default Functors in the newLISP Scripting Language</h2></center>
 <center>
-<font size="-1">Lutz Mueller, 2007-2015. Last edit December 6th 2013, rev r9<br/></font>
+<font size="-1">Lutz Mueller, 2007-2018. Last edit July 26th 2018<br/></font>
 </center>
 
 <center><blockquote><blockquote><i>
@@ -462,7 +462,8 @@ <h3>The default functor used as a pseudo hash function</h3>
 associative key &rarr; value access:</p>
 
 <blockquote><pre>
-(define aHash:aHash) ; create namespace and default functor containing nil
+(define aHash:aHash) ; create namespace and default functor 
+                     ; containing nil
 
 (aHash "var" 123) ; create and set a key "var" to 123
 
@@ -477,7 +478,7 @@ <h3>References</h3>
 [2] <i>John McCarthy</i>, 1960<br />
 <a href="http://www-formal.stanford.edu/jmc/recursive.html">Recursive Functions of Symbolic Expressions and their Computation by Machine</a>.
 <br /><br />
-<center><font size="-1">Copyright &copy; 2007-2016, Lutz Mueller 
+<center><font size="-1">Copyright &copy; 2007-2018, Lutz Mueller 
 <a href="http://newlisp.org">http://newlisp.org</a>. All rights reserved. </font></center>
 </blockquote>
 </body>