[m-rev.] for review: delete mtogl from the extras distribution

Julien Fischer juliensf at csse.unimelb.edu.au
Thu Oct 11 17:14:06 AEST 2007
Previous message: [m-rev.] diff: foreign enumerations and glu binding
Next message: [m-rev.] for review: delete mtogl from the extras distribution
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
For review by anyone.

Estimated hours taken: 0.5
Branches: main

Delete mtogl, the Mercury binding to the togl Tk widget that was
previously included with the Mercury OpenGL binding.  The version
we shipped with the extras distribution hasn't worked properly for
a long time.  We now provide two alternatives in the extras distribution
that provide the same functionality that mtogl did.

Deleting mtogl also simplifies the license conditions on the extras
distribution, since togl and the bits of tk that we needed to make it
work were both released under fairly restrictive licenses.

extras/graphics/mercury_opengl/LICENSE.TK:
extras/graphics/mercury_opengl/LICENSE.TOGL:
extras/graphics/mercury_opengl/Mmakefile.mtogl:
extras/graphics/mercury_opengl/mtogl.m:
extras/graphics/mercury_opengl/tkConsole.c:
extras/graphics/mercury_opengl/tk*.h:
extras/graphics/mercury_opengl/togl.[ch]:
 	Delete mtogl, togl and the various parts of Tk that were
 	needed to make them work.

extras/graphics/mercury_opengl/README:
 	Delete references to mtogl, Tcl/Tk etc.

 	Mention that the GLUT and Allegro bindings may be used to
 	provide rendering contexts.

extras/graphics/mercury_opengl/HOWTO:
 	Delete references to mtogl, Tcl/Tk etc.
 	XXX the remainder of this file is very much out of date and should
 	be rewritten.

.README.in:
 	Delete the paragraphs about the licensing conditions for togl
 	and Tk.  We no longer include them.

NEWS:
 	Announce the deletion of mtogl.

Julien.

(The diff only contains changes to those files that are not being deleted.)

Index: .README.in
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/.README.in,v
retrieving revision 1.19
diff -u -r1.19 .README.in
--- .README.in	3 Jan 2007 02:37:27 -0000	1.19
+++ .README.in	11 Oct 2007 07:09:27 -0000
@@ -51,19 +51,6 @@
  The files in the `samples' directory are either public domain, or
  distributed under the GNU General Public License.

-Some of the files in the `extras' subdirectory (which is now distributed
-separately in the `mercury-extras' package) have fairly restrictive
-copyright licences: 
-
-	The `Togl' library in extras/graphics/mtogl/togl.* is copyright by
-	Brian Paul and Ben Bederson; see the file
-	extras/graphics/mtogl/LICENSE.TOGL.
-
-	The Tk files in extras/graphics/mtogl/tk.* are copyright
-	by the Regents of the University of California,
-	Sun Microsystems, Inc., and other parties. 
-	See the file extras/graphics/mtogl/LICENSE.TK.
-
  THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY
  EXPRESSED OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.  See the file COPYING.

Index: NEWS
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/NEWS,v
retrieving revision 1.479
diff -u -r1.479 NEWS
--- NEWS	25 Sep 2007 23:18:44 -0000	1.479
+++ NEWS	11 Oct 2007 07:09:27 -0000
@@ -240,6 +240,9 @@
  * The extras distribution now includes a binding to the Allegro and
    AllegroGL game programming libraries.

+* `mtogl', the Mercury binding to the Tk widget `togl' has been removed
+  from the distribution.
+
  Changes to the Mercury debugger:

  * A `track' mdb command has been added.
Index: extras/graphics/mercury_opengl/HOWTO
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/extras/graphics/mercury_opengl/HOWTO,v
retrieving revision 1.1
diff -u -r1.1 HOWTO
--- extras/graphics/mercury_opengl/HOWTO	10 Mar 1998 06:31:31 -0000	1.1
+++ extras/graphics/mercury_opengl/HOWTO	11 Oct 2007 07:09:27 -0000
@@ -6,33 +6,26 @@

  You need to add some information to your Mmakefile to tell mmake
  where the mercury_opengl library is, and to link with the
-mercury_opengl, mercury_tcltk, tcl, tk, Mesa/GL and X libraries.
+mercury_opengl, Mesa/GL and X libraries.

-The following is an example. You may need to change the `tk8.0',
-`tcl8.0' `MesaGLU' and `MesaGL' if you are using a different version of
-Tcl/Tk, or a different OpenGL implementation. Don't forget to change
-the directories the directories where this package is installed.
+The following is an example. You may need to change the `MesaGLU' and
+`MesaGL' if you are using a different OpenGL implementation.
+Don't forget to change the directories the directories where this package
+is installed.

  ---------------------------------------------------------------------------

-OPENGL_MLLIBS  =  -ltk8.0 -ltcl8.0 -lMesaGLU -lMesaGL \
-			-L/usr/X11R6/lib -lX11 -lXmu -lXext -ldl
+OPENGL_MLLIBS  = -lMesaGLU -lMesaGL -L/usr/X11R6/lib -lX11 -lXmu -lXext -ldl

-# Specify the location of the `mercury_tcltk' package.
-MERCURY_TCLTK_DIR  = some/directory/mercury_tcltk
  MERCURY_OPENGL_DIR  = some/directory/mercury_opengl

-# Tell mmake to use the `mercury_tcltk' and `mercury_opengl' libraries.
-VPATH           = $(MERCURY_OPENGL_DIR):$(MERCURY_TCLTK_DIR):$(MMAKE_VPATH)
-MCFLAGS         = -I$(MERCURY_TCLTK_DIR) -I$(MERCURY_OPENGL_DIR) \
-                        $(EXTRA_MCFLAGS)
-MLFLAGS         = -R$(MERCURY_TCLTK_DIR) -R$(MERCURY_OPENGL_DIR) \
-                        $(EXTRA_MLFLAGS) -L$(MERCURY_TCLTK_DIR)  \
-                        -L$(MERCURY_OPENGL_DIR)
-MLLIBS          = -lmercury_opengl -lmercury_tcltk $(OPENGL_MLLIBS) \
-			$(EXTRA_MLLIBS)
-C2INITFLAGS     = $(MERCURY_TCLTK_DIR)/mercury_tcltk.init \
-                  $(MERCURY_OPENGL_DIR)/mercury_opengl.init
+# Tell mmake to use the `mercury_opengl' libraries.
+VPATH           = $(MERCURY_OPENGL_DIR):$(MMAKE_VPATH)
+MCFLAGS         =  -I$(MERCURY_OPENGL_DIR) $(EXTRA_MCFLAGS)
+MLFLAGS         =  -R$(MERCURY_OPENGL_DIR) \
+                        $(EXTRA_MLFLAGS) -L$(MERCURY_OPENGL_DIR)
+MLLIBS          = -lmercury_opengl $(OPENGL_MLLIBS) $(EXTRA_MLLIBS)
+C2INITFLAGS     = $(MERCURY_OPENGL_DIR)/mercury_opengl.init

  ---------------------------------------------------------------------------

Index: extras/graphics/mercury_opengl/README
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/extras/graphics/mercury_opengl/README,v
retrieving revision 1.4
diff -u -r1.4 README
--- extras/graphics/mercury_opengl/README	29 Jun 2005 05:21:43 -0000	1.4
+++ extras/graphics/mercury_opengl/README	11 Oct 2007 07:09:27 -0000
@@ -1,51 +1,28 @@
-
  This directory contains the package `mercury_opengl', which is a Mercury
-binding for OpenGL  and the package `mtogl' which is a tk widget for 
-creating and managing OpenGL rendering contexts.
+binding for OpenGL.

  For `mercury_opengl', you will need:
  	- the Mercury system
  	- an OpenGL implementation such as Mesa.

  In order to use it you will also need some way for your program to
-create and manage rendering contexts (mtogl is one such way).
-
-For `mtogl' you will need:
-	- the Mercury system.
-	- Tcl/Tk (Tk 4.0 or later)
-	- the `mercury_tcltk' package
-
-NOTES:
-	- You must link `mtogl' against the same version of Tcl/Tk as the
-	  `mercury_tcltk' package.
-	- mtogl will probably not work versions of Tcl/Tk greater than 8.0.
+create and manage rendering contexts.  The Mercury GLUT binding provides
+one such way and Mercury Allegro binding provides another; both of these
+bindings are available as part of the Mercury extras distribution.

-This directory contains the following modules.
+This directory contains the following files:

  	mglu.m	- provides Mercury bindings to (some of) the GLU library.
  	mogl.m	- provides Mercury bindings to (some of) Open GL 1.1
-	mtogl.m	- provides a Mercury binding to Togl, a
-			  tcl/tk OpenGL widget.
- 
-	togl.c, togl.h  - Togl 1.5
-
-	other .c and .h - Internals of Tk.
-	files

  See the file Mmakefile for instructions on how to build the OpenGL binding.
  The file Mmakefile.MacOSX contains instructions on how to build the binding
  on systems with MacOS X.
-The file Mmakefile.mtogl contains instructions on how to build mtogl.

  See HOWTO for details on how to link the package in with your own
  Mercury programs.

  	The mercury_opengl package is free software, but is Copyright
-	(C) 1997-1998 The University of Melbourne. It is distributed
+	(C) 1997-2007 The University of Melbourne. It is distributed
  	under the terms of the GNU Library General Public License.
  	See the file COPYING.LIB for copying permission.
-
-See LICENSE.TOGL to see the licensing conditions for Togl.
-
-See LICENSE.TK to see the licensing conditions for Tk.
-

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------
Previous message: [m-rev.] diff: foreign enumerations and glu binding
Next message: [m-rev.] for review: delete mtogl from the extras distribution
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the reviews mailing list