From: Matt Birkholz Date: Tue, 29 Mar 2016 22:09:33 +0000 (-0700) Subject: cairo: Use libtool/automake. X-Git-Tag: mit-scheme-pucked-9.2.12~353 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=d962bb953e0d6125f02c48d0a15be95ff81aa1e3;p=mit-scheme.git cairo: Use libtool/automake. --- diff --git a/src/cairo/AUTHORS b/src/cairo/AUTHORS new file mode 100644 index 000000000..11c76de3b --- /dev/null +++ b/src/cairo/AUTHORS @@ -0,0 +1,5 @@ +To find out what should go in this file, see "Information For +Maintainers of GNU Software" (maintain.texi), the section called +"Recording Changes". + +Matthew Birkholz Everything up to the initial automake conversion. diff --git a/src/cairo/COPYING b/src/cairo/COPYING new file mode 100644 index 000000000..bf50f20de --- /dev/null +++ b/src/cairo/COPYING @@ -0,0 +1,482 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if +you distribute copies of the library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the source code distributed need not include anything that is normally +distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307 USA. + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/src/cairo/ChangeLog b/src/cairo/ChangeLog new file mode 100644 index 000000000..38f616f28 --- /dev/null +++ b/src/cairo/ChangeLog @@ -0,0 +1,8 @@ +-*-Text-*- + +Please see the git commit log: + +$ git clone git://git.savannah.gnu.org/mit-scheme.git +$ git remote add puck git://birchwood-abbey.net/~matt/mit-scheme.git +$ git fetch puck Gtk +$ git log puck/Gtk -- src/cairo/ | more diff --git a/src/cairo/Makefile.am b/src/cairo/Makefile.am new file mode 100644 index 000000000..0c8282097 --- /dev/null +++ b/src/cairo/Makefile.am @@ -0,0 +1,107 @@ +## Process this file with automake to produce Makefile.in +## +## Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, +## 2016 Matthew Birkholz +## +## This file is part of a cairo plugin for MIT/GNU Scheme. +## +## This plugin is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; either version 2 of the License, +## or (at your option) any later version. +## +## This plugin is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this plugin; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +## 02110-1301, USA. + +ACLOCAL_AMFLAGS = -I m4 +EXTRA_DIST = autogen.sh + +MIT_SCHEME_EXE = @MIT_SCHEME_EXE@ +scmlibdir = $(libdir)/mit-scheme-@MIT_SCHEME_ARCH@ +scmlib_cairodir = $(scmlibdir)/cairo + +scmlib_LTLIBRARIES = cairo-shim.la +scmlib_DATA = cairo-types.bin cairo-const.bin +scmlib_cairo_DATA = cairo.scm cairo.bin cairo.bci cairo.com +scmlib_cairo_DATA += cairo-graphics.scm cairo-graphics.bin +scmlib_cairo_DATA += cairo-graphics.bci cairo-graphics.com +scmlib_cairo_DATA += make.scm cairo-@MIT_SCHEME_OS_SUFFIX@.pkd + +info_TEXINFOS = mit-scheme-cairo.texi +AM_MAKEINFOHTMLFLAGS = --no-split + +# Set these to the defaults used by Scheme. +infodir = $(datarootdir)/info +htmldir = $(libdir)/mit-scheme/doc +dvidir = $(libdir)/mit-scheme/doc +pdfdir = $(libdir)/mit-scheme/doc + +AM_CPPFLAGS = -I$(scmlibdir) +AM_CFLAGS = `pkg-config --cflags pangocairo` +LIBS = `pkg-config --libs pangocairo` + +cairo_shim_la_LDFLAGS = -module -avoid-version -shared + +noinst_PROGRAMS = cairo-const +cairo_const_SOURCES = cairo-const.c + +cairo-shim.c: stamp-shim +cairo-const.c: stamp-shim +cairo-types.bin: stamp-shim +stamp-shim: cairo.cdecl + touch stamp-shim + echo '(generate-shim "cairo" "#include ")' \ + | $(MIT_SCHEME_EXE) --batch-mode \ + || rm stamp-shim + +cairo-const.bin: cairo-const.scm + echo '(sf "cairo-const")' | $(MIT_SCHEME_EXE) --batch-mode + +cairo-const.scm: cairo-const + ./cairo-const + +cairo.bin: stamp-scheme +cairo.bci: stamp-scheme +cairo.com: stamp-scheme +cairo-graphics.bin: stamp-scheme +cairo-graphics.bci: stamp-scheme +cairo-graphics.com: stamp-scheme +cairo-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme +stamp-scheme: stamp-shim cairo-graphics.scm cairo.scm + touch stamp-scheme + ./compile.sh || rm stamp-scheme + +CLEANFILES = cairo-const* cairo-shim.c +CLEANFILES += *.bin *.ext *.com *.bci *.moc *.fni *.crf *.fre *.pkd + +TESTS = cairo-check.sh + +check-local: + ./check-doc.sh + +ETAGS_ARGS = cairo.scm cairo-graphics.scm -r '/^([^iI].*/' cairo.cdecl +TAGS_DEPENDENCIES = cairo.scm cairo-graphics.scm cairo.cdecl + +install-data-hook: + echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \ + | $(MIT_SCHEME_EXE) --batch-mode + +install-html: install-html-am + echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ + | $(MIT_SCHEME_EXE) --batch-mode + +uninstall-hook: + echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \ + | $(MIT_SCHEME_EXE) --batch-mode + [ -d "$(DESTDIR)$(scmlib_cairodir)" ] \ + && rmdir "$(DESTDIR)$(scmlib_cairodir)" + [ -d "$(DESTDIR)$(htmldir)" ] \ + && ( echo '(update-html-index "$(DESTDIR)$(htmldir)/")' \ + | $(MIT_SCHEME_EXE) --batch-mode ) diff --git a/src/cairo/Makefile.in b/src/cairo/Makefile.in deleted file mode 100644 index c5ac883db..000000000 --- a/src/cairo/Makefile.in +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright (C) 2014 Matthew Birkholz -# -# This file is part of an extension to MIT/GNU Scheme. -# -# MIT/GNU Scheme is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# MIT/GNU Scheme is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with MIT/GNU Scheme; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301, USA. - -MIT_SCHEME_EXE = mit-scheme -exe = '$(MIT_SCHEME_EXE)' --batch-mode - -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ - -prefix = @prefix@ -datarootdir = @datarootdir@ -infodir = @infodir@ - -all: cairo-shim.so cairo-types.bin cairo-const.bin - echo '(load "compile")' | $(exe) - @if [ -s cairo-unx.crf ]; then \ - echo "cairo-unx.crf:0: warning: non-empty"; exit 1; fi - -check: - ( echo '(begin'; \ - echo ' (load "check")'; \ - echo ' (load "check-doc"))' ) | $(exe) - -doc: mit-scheme-cairo.info -doc: mit-scheme-cairo.html - -mit-scheme-cairo.info: cairo.texinfo - makeinfo --no-split --output=$@ $^ - -mit-scheme-cairo.html: cairo.texinfo - makeinfo --html --no-split --output=$@ $^ - -.PHONY: all check doc - -install: - ( echo '(begin'; \ - echo ' (install-shim "$(DESTDIR)" "cairo")'; \ - echo ' (install-load-option "$(DESTDIR)" "cairo"))' ) \ - | $(exe) -- *.com *.bci *.pkd make.scm - -install-info: mit-scheme-cairo.info - install $< $(DESTDIR)$(infodir)/ - install-info $< $(DESTDIR)$(infodir)/dir - -install-html: mit-scheme-cairo.html - echo "(install-html \"$(DESTDIR)\" \"GNOME interface\")" | $(exe) -- $< - -.PHONY: install install-info install-html - -clean: - rm -f cairo-const.scm cairo-const cairo-const.c cairo-shim.c - rm -f cairo-*.crf cairo-*.fre cairo-*.pkd - rm -f *.o *.so *.bin *.ext *.com *.bci *.moc *.fni - rm -f mit-scheme-cairo.html mit-scheme-cairo.info - -distclean: clean - rm -f Makefile config.h config.log config.status - -maintainer-clean: distclean - rm -f configure config.h.in TAGS - rm -rf autom4te.cache - -tags: - etags *.h \ - `echo *.c | sed 's/ cairo-const.c//; s/ cairo-shim.c//'` \ - `echo *.scm | sed 's/ cairo-const.scm//'` \ - -r '/^([^iI].*/' Includes/*.cdecl - echo "\f\n../pango/TAGS,include" >>TAGS - -.PHONY: clean distclean maintainer-clean tags - -cairo-shim.so: cairo-shim.o - echo "(link-shim)" | $(exe) -- $(LDFLAGS) -o $@ $^ $(LIBS) \ - `pkg-config --libs pangocairo` - -cairo-shim.o: cairo-shim.c - echo "(compile-shim)" | $(exe) -- $(CPPFLAGS) $(CFLAGS) \ - `pkg-config --cflags pangocairo` -c $< - -cairo-shim.c cairo-const.c cairo-types.bin: cairo.cdecl - echo '(generate-shim "cairo" "#include ")' | $(exe) - -cairo-const.bin: cairo-const.scm - echo '(sf "cairo-const")' | $(exe) - -cairo-const.scm: cairo-const - ./cairo-const - -cairo-const: cairo-const.o - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - -cairo-const.o: cairo-const.c - $(CC) $(CPPFLAGS) $(CFLAGS) `pkg-config --cflags pangocairo` -c $< diff --git a/src/cairo/NEWS b/src/cairo/NEWS new file mode 100644 index 000000000..fe9794ca9 --- /dev/null +++ b/src/cairo/NEWS @@ -0,0 +1,26 @@ +mit-scheme-cairo NEWS -- history of user-visible changes. + +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz + +This file is part of a cairo plugin for MIT/GNU Scheme. + +This plugin is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. + +This plugin is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +mit-scheme-cairo 0.5 - Matt Birkholz, 2016-03-13 +================================================ + +* Use libtool and automake, rather than the microcode's disappearing + module support. diff --git a/src/cairo/README b/src/cairo/README index c89985f3e..65c17aebf 100644 --- a/src/cairo/README +++ b/src/cairo/README @@ -1,13 +1,20 @@ +-*-Text-*- + The Cairo vector graphics plugin. -To build: +To build and install: ./configure - make all check install + make all check + make install install-html + +To use: + + (load-option 'CAIRO) + (cairo-image-surface-create 500 500) + +To import into a CREF package set (.pkg file): -The install target copies a shared library shim and compiled Scheme -files into the system library path, and re-writes the optiondb.scm -found there. You can override the default command name "mit-scheme" -(and thus the system library path) by setting MIT_SCHEME_EXE. + (global-definitions cairo/) For more information see the accompanying user / reference manual. diff --git a/src/cairo/autogen.sh b/src/cairo/autogen.sh new file mode 100755 index 000000000..8af4031c7 --- /dev/null +++ b/src/cairo/autogen.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +set -e +rm -rf m4 +mkdir m4 +autoreconf --force --install -I m4 diff --git a/src/cairo/cairo-check.scm b/src/cairo/cairo-check.scm deleted file mode 100644 index 2d29bbaea..000000000 --- a/src/cairo/cairo-check.scm +++ /dev/null @@ -1 +0,0 @@ -(warn "No Cairo plugin tests!") \ No newline at end of file diff --git a/src/cairo/cairo-check.sh b/src/cairo/cairo-check.sh new file mode 100755 index 000000000..4c3207a85 --- /dev/null +++ b/src/cairo/cairo-check.sh @@ -0,0 +1,10 @@ +#!/bin/sh +# -*-Scheme-*- +# +# Test the CAIRO option. + +set -e +: ${MIT_SCHEME_EXE=mit-scheme} +${MIT_SCHEME_EXE} --prepend-library . <<\EOF +(load-option 'CAIRO) +EOF diff --git a/src/cairo/cairo-graphics.scm b/src/cairo/cairo-graphics.scm index f812adcd1..cbc9bdfdd 100644 --- a/src/cairo/cairo-graphics.scm +++ b/src/cairo/cairo-graphics.scm @@ -1,23 +1,23 @@ #| -*-Scheme-*- -Copyright (C) 2014 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a cairo plugin for MIT/GNU Scheme. -MIT/GNU Scheme is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. +This plugin is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# diff --git a/src/cairo/cairo.cdecl b/src/cairo/cairo.cdecl index 1bde747dd..163343b76 100644 --- a/src/cairo/cairo.cdecl +++ b/src/cairo/cairo.cdecl @@ -1,23 +1,23 @@ #| -*-Scheme-*- -Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2014 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a cairo plugin for MIT/GNU Scheme. -MIT/GNU Scheme is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. +This plugin is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# diff --git a/src/cairo/cairo.pkg b/src/cairo/cairo.pkg index fabfe5804..56d7d717a 100644 --- a/src/cairo/cairo.pkg +++ b/src/cairo/cairo.pkg @@ -1,23 +1,23 @@ #| -*-Scheme-*- -Copyright (C) 2014 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a cairo plugin for MIT/GNU Scheme. -MIT/GNU Scheme is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. +This plugin is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# diff --git a/src/cairo/cairo.scm b/src/cairo/cairo.scm index fe82e03ea..8c521c338 100644 --- a/src/cairo/cairo.scm +++ b/src/cairo/cairo.scm @@ -1,27 +1,27 @@ #| -*-Scheme-*- -Copyright (C) 2012, 2013, 2014 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a cairo plugin for MIT/GNU Scheme. -MIT/GNU Scheme is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. +This plugin is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |# -;;;; Cairo interface. +;;;; Cairo Objects ;;; package: (gtk cairo) (C-include "cairo") diff --git a/src/cairo/check-doc.scm b/src/cairo/check-doc.scm deleted file mode 100644 index e14edef2f..000000000 --- a/src/cairo/check-doc.scm +++ /dev/null @@ -1,112 +0,0 @@ -#| -*-Scheme-*- - - Check that every binding exported to () has a - corresponding @deffn in cairo.texinfo. |# - -(load-option 'cref) -(define read-package-model) -(define pmodel/packages) -(define package/name) -(define package/bindings) -(define package/links) -(define link/source) -(define link/destination) -(define binding/package) -(define binding/name) -(let ((cref (->environment '(cross-reference)))) - (set! read-package-model (access read-package-model cref)) - (set! pmodel/packages (access pmodel/packages cref)) - (set! package/name (access package/name cref)) - (set! package/bindings (access package/bindings cref)) - (set! package/links (access package/links cref)) - (set! link/source (access link/source cref)) - (set! link/destination (access link/destination cref)) - (set! binding/package (access binding/package cref)) - (set! binding/name (access binding/name cref))) - -(define (deffn-name line) - (let ((regs (re-string-match - (string-append "@deffnx?" - " \\(Class\\|Procedure\\|{Generic Procedure}\\)" - " \\([-A-Za-z0-9<>?!+./:]+\\)") - line))) - (if regs - (intern (re-match-extract line regs 2)) - (error "Could not find binding name:" line)))) - -(define (texinfo-deffns lines) - (let ((len (vector-length lines))) - (let loop ((i 0) (deffns '())) - (if (fix:< i len) - (let ((line (vector-ref lines i))) - (loop (fix:1+ i) - (if (string-prefix? "@deffn" line) - (cons (deffn-name line) deffns) - deffns))) - deffns)))) - -(define (read-lines port) - (let loop () - (let ((line (read-line port))) - (if (eof-object? line) - '() - (cons line (loop)))))) - -(define (pmodel/find-package pmodel package-name) - (find-matching-item (pmodel/packages pmodel) - (lambda (p) (equal? package-name (package/name p))))) - -(define (pmodel/global-exports pmodel) - (define (global-exports package) - (append-map! (lambda (link) - (if (eq? '() (package/name - (binding/package - (link/destination link)))) - (list (binding/name (link/destination link))) - '())) - (package/links package))) - (append-map! global-exports (pmodel/packages pmodel))) - -(define (pmodel/package-bindings pmodel package-name) - (let ((package (pmodel/find-package pmodel package-name))) - (if package - (map binding/name (package/bindings package)) - (error "No such package:" package-name)))) - -(define (duplicates listset) - (let loop ((items listset) (duplicates '())) - (cond ((null? items) - (reverse! duplicates)) - ((memq (car items) (cdr items)) - (if (memq (car items) duplicates) - (loop (cdr items) duplicates) - (loop (cdr items) (cons (car items) duplicates)))) - (else - (loop (cdr items) duplicates))))) - -(define (minus set1 set2) - (let loop ((items set1) (difference '())) - (cond ((null? items) - difference) - ((memq (car items) set2) - (loop (cdr items) difference)) - (else - (loop (cdr items) (cons (car items) difference)))))) - -(define (check) - (let* ((texinfo (list->vector (call-with-input-file "cairo.texinfo" - read-lines))) - (deffns (texinfo-deffns texinfo)) - (dups (duplicates deffns)) - (pmodel (read-package-model "cairo" microcode-id/operating-system)) - (bindings (pmodel/global-exports pmodel)) - (missing (minus bindings deffns)) - (extras (minus deffns bindings))) - (if (not (null? dups)) - (for-each (lambda (name) (warn "multiple-descriptions:" name)) dups)) - (if (not (null? extras)) - (for-each (lambda (name) (warn "not bound:" name)) extras)) - (if (not (null? missing)) - (for-each (lambda (name) (warn "not documented:" name)) missing)))) - -(check) \ No newline at end of file diff --git a/src/cairo/check-doc.sh b/src/cairo/check-doc.sh new file mode 100755 index 000000000..a8a70e742 --- /dev/null +++ b/src/cairo/check-doc.sh @@ -0,0 +1,147 @@ +#!/bin/bash +# -*-Scheme-*- +# +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, +# 2016 Matthew Birkholz +# +# This file is part of a cairo plugin for MIT/GNU Scheme. +# +# This plugin is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This plugin is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this plugin; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# Check the documentation. + +set -e +: ${MIT_SCHEME_EXE=mit-scheme} +${MIT_SCHEME_EXE} --batch-mode <<\EOF + +(let ((pkgset "cairo") + (texi "mit-scheme-cairo.texi") + (pkg '())) + ;; Check that every binding exported to () or PKG has a + ;; corresponding @deffn in TEXI. + + (parameterize ((param:suppress-loading-message? #t)) + (load-option 'CREF)) + (define read-package-model) + (define pmodel/packages) + (define package/name) + (define package/bindings) + (define package/links) + (define link/source) + (define link/destination) + (define binding/package) + (define binding/name) + (let ((cref (->environment '(cross-reference)))) + (set! read-package-model (access read-package-model cref)) + (set! pmodel/packages (access pmodel/packages cref)) + (set! package/name (access package/name cref)) + (set! package/bindings (access package/bindings cref)) + (set! package/links (access package/links cref)) + (set! link/source (access link/source cref)) + (set! link/destination (access link/destination cref)) + (set! binding/package (access binding/package cref)) + (set! binding/name (access binding/name cref))) + + (define (deffn-name line) + (let ((regs (re-string-match + (string-append "@deffnx?" + " \\(Class\\|Procedure\\|{Generic Procedure}\\)" + " \\([-A-Za-z0-9<>?!+./:]+\\)") + line))) + (if regs + (intern (re-match-extract line regs 2)) + (error "Could not find binding name:" line)))) + + (define (texinfo-deffns lines) + (let ((len (vector-length lines))) + (let loop ((i 0) (deffns '())) + (if (fix:< i len) + (let ((line (vector-ref lines i))) + (loop (fix:1+ i) + (if (string-prefix? "@deffn" line) + (cons (deffn-name line) deffns) + deffns))) + deffns)))) + + (define (read-lines port) + (let loop () + (let ((line (read-line port))) + (if (eof-object? line) + '() + (cons line (loop)))))) + + (define (pmodel/find-package pmodel package-name) + (find-matching-item (pmodel/packages pmodel) + (lambda (p) (equal? package-name (package/name p))))) + + (define (pmodel/global-exports pmodel) + (define (global-exports package) + (append-map! (lambda (link) + (if (eq? '() (package/name + (binding/package + (link/destination link)))) + (list (binding/name (link/destination link))) + '())) + (package/links package))) + (append-map! global-exports (pmodel/packages pmodel))) + + (define (pmodel/package-bindings pmodel package-name) + (let ((package (pmodel/find-package pmodel package-name))) + (if package + (map binding/name (package/bindings package)) + (error "No such package:" package-name)))) + + (define (duplicates listset) + (let loop ((items listset) (duplicates '())) + (cond ((null? items) + (reverse! duplicates)) + ((memq (car items) (cdr items)) + (if (memq (car items) duplicates) + (loop (cdr items) duplicates) + (loop (cdr items) (cons (car items) duplicates)))) + (else + (loop (cdr items) duplicates))))) + + (define (minus set1 set2) + (let loop ((items set1) (difference '())) + (cond ((null? items) + difference) + ((memq (car items) set2) + (loop (cdr items) difference)) + (else + (loop (cdr items) (cons (car items) difference)))))) + + (define (check) + (let* ((texinfo (list->vector (call-with-input-file texi read-lines))) + (deffns (texinfo-deffns texinfo)) + (dups (duplicates deffns)) + (pmodel (read-package-model pkgset microcode-id/operating-system)) + (bindings (append (pmodel/global-exports pmodel) + (if (null? pkg) + '() + (pmodel/package-bindings pmodel pkg)))) + (missing (minus bindings deffns)) + (extras (minus deffns bindings))) + (if (not (null? dups)) + (for-each (lambda (name) (warn "multiple-descriptions:" name)) dups)) + (if (not (null? extras)) + (for-each (lambda (name) (warn "not bound:" name)) extras)) + (if (not (null? missing)) + (for-each (lambda (name) (warn "not documented:" name)) missing)))) + + (check) + ) +EOF diff --git a/src/cairo/check.scm b/src/cairo/check.scm deleted file mode 100644 index 6bf831c9c..000000000 --- a/src/cairo/check.scm +++ /dev/null @@ -1,12 +0,0 @@ -#| -*-Scheme-*- |# - -;;;; Test the cairo wrapper. - -(let ((dirname (directory-pathname (current-load-pathname))) - (param (access library-directory-path - (->environment '(runtime pathname))))) - (parameterize ((param (cons dirname (param)))) - (set! *initial-options-file* (merge-pathnames "cairo-optiondb" dirname)) - (load-option 'CAIRO))) - -(load "cairo-check" (->environment '(CAIRO))) \ No newline at end of file diff --git a/src/cairo/compile.scm b/src/cairo/compile.scm deleted file mode 100644 index 44c9008dc..000000000 --- a/src/cairo/compile.scm +++ /dev/null @@ -1,47 +0,0 @@ -#| -*-Scheme-*- - -Copyright (C) 2014 Matthew Birkholz - -This file is part of an extension to MIT/GNU Scheme. - -MIT/GNU Scheme is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. - -MIT/GNU Scheme is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. - -|# - -;;;; Compile the Cairo wrapper. - -(load-option 'CREF) -(load-option 'PANGO) -(load-option 'FFI) -(with-working-directory-pathname (directory-pathname (current-load-pathname)) - (lambda () - (with-system-library-directories - '("./") - (lambda () - (if (name->package '(CAIRO)) - (error "The Cairo package already exists.") - (let ((package-set (package-set-pathname "cairo"))) - (if (not (file-modification-timeenvironment '(cairo))) - - (compile-file "cairo-graphics" '("cairo-const.bin") - (->environment '(cairo graphics))) - - (cref/generate-constructors "cairo" 'ALL))))) \ No newline at end of file diff --git a/src/cairo/compile.sh b/src/cairo/compile.sh new file mode 100755 index 000000000..35112755d --- /dev/null +++ b/src/cairo/compile.sh @@ -0,0 +1,55 @@ +#!/bin/sh +# -*-Scheme-*- +# +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, +# 2016 Matthew Birkholz +# +# This file is part of a cairo plugin for MIT/GNU Scheme. +# +# This plugin is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This plugin is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this plugin; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# Compile the CAIRO option. + +set -e +: ${MIT_SCHEME_EXE=mit-scheme} +${MIT_SCHEME_EXE} --prepend-library . --batch-mode <<\EOF +(begin + + (parameterize ((param:suppress-loading-message? #t)) + (load-option 'CREF) + (load-option 'PANGO) + (load-option 'FFI)) + + (if (name->package '(CAIRO)) + (error "The CAIRO package already exists.")) + (let ((package-set (package-set-pathname "cairo"))) + (if (not (file-modification-timeenvironment '(cairo))) + + (compile-file "cairo-graphics" '("cairo-const.bin") + (->environment '(cairo graphics))) + + (cref/generate-constructors "cairo") + ) +EOF +SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_EXE} --batch-mode` +REPORT=cairo-$SUFFIX.crf +if [ -s "$REPORT" ]; then echo "$REPORT:1: error: not empty"; exit 1; fi diff --git a/src/cairo/configure.ac b/src/cairo/configure.ac index ffb5206f7..a2412475f 100644 --- a/src/cairo/configure.ac +++ b/src/cairo/configure.ac @@ -1,64 +1,82 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([MIT/GNU Scheme Cairo interface], - [0.1], - [bug-mit-scheme@gnu.org], +AC_PREREQ([2.69]) +AC_INIT([MIT/GNU Scheme cairo plugin], + [0.5], + [puck@birchwood-abbey.net], [mit-scheme-cairo]) AC_CONFIG_SRCDIR([cairo.pkg]) +AC_CONFIG_MACRO_DIR([m4]) AC_COPYRIGHT( -[Copyright (C) 2014 Matthew Birkholz +[Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of an extension to MIT/GNU Scheme. +This file is part of a cairo plugin for MIT/GNU Scheme. -MIT/GNU Scheme is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. +This plugin is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. ]) AH_TOP([/* -Copyright (C) 2014 Matthew Birkholz +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, + 2016 Matthew Birkholz -This file is part of MIT/GNU Scheme. +This file is part of a cairo plugin for MIT/GNU Scheme. -MIT/GNU Scheme is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. +This plugin is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. -MIT/GNU Scheme is distributed in the hope that it will be useful, but +This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. +along with this plugin; if not, write to the Free Software Foundation, +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */]) +AM_INIT_AUTOMAKE + +AC_PROG_LIBTOOL +AC_PROG_CC +AC_PROG_CPP +AC_PROG_INSTALL + +dnl Initialize libtool +LT_PREREQ([2.2.6]) +LT_INIT([dlopen win32-dll]) + AC_CHECK_PROG([PKG_CONFIG], [pkg-config], [yes]) if ! pkg-config --exists cairo 2>/dev/null; then AC_MSG_ERROR([Cairo not found.]) fi -AC_SUBST([CFLAGS]) -AC_SUBST([CPPFLAGS]) -AC_SUBST([LDFLAGS]) -AC_SUBST([LIBS]) +: ${MIT_SCHEME_EXE=mit-scheme} +MIT_SCHEME_ARCH=`echo "(display microcode-id/compiled-code-type)" \ + | ${MIT_SCHEME_EXE} --batch-mode` +MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_EXE} --batch-mode` + +AC_SUBST([MIT_SCHEME_EXE]) +AC_SUBST([MIT_SCHEME_ARCH]) +AC_SUBST([MIT_SCHEME_OS_SUFFIX]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/src/cairo/cairo.texinfo b/src/cairo/mit-scheme-cairo.texi similarity index 96% rename from src/cairo/cairo.texinfo rename to src/cairo/mit-scheme-cairo.texi index 55fb78539..454310b5b 100644 --- a/src/cairo/cairo.texinfo +++ b/src/cairo/mit-scheme-cairo.texi @@ -1,6 +1,6 @@ \input texinfo @c -*-Texinfo-*- @comment %**start of header -@setfilename mit-scheme-cairo +@setfilename mit-scheme-cairo.info @set VERSION 0.5 @settitle Cairo Plugin @value{VERSION} @comment %**end of header @@ -24,9 +24,11 @@ @end ifnothtml @copying -This manual documents MIT/GNU Scheme's Cairo plugin @value{VERSION}. +This manual documents a Cairo plugin for MIT/GNU Scheme, version +@value{VERSION}. -Copyright @copyright{} 2014 Matthew Birkholz +Copyright @copyright{} 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, + 2015, 2016 Matthew Birkholz @quotation Permission is granted to copy, distribute and/or modify this document @@ -47,7 +49,7 @@ Documentation License.'' @titlepage @title The MIT/GNU Scheme Cairo Plugin Manual @subtitle Schemely access (@value{VERSION}) to the GNOME toolkits -@subtitle for MIT/GNU Scheme version 9.1 +@subtitle for MIT/GNU Scheme version 9.3 @author by Matt Birkholz (@email{birkholz@@alum.mit.edu}) @page @vskip 0pt plus 1filll @@ -64,7 +66,6 @@ Documentation License.'' @menu * Introduction:: * API Reference:: -* Installation:: * GNU Free Documentation License:: @end menu @@ -80,7 +81,7 @@ collector. When Scheme's representative of a toolkit resource is dropped and collected, the toolkit resource is freed, just as the C/Unix FFI's malloced aliens are automatically freed. -@node API Reference, Installation, Introduction, Top +@node API Reference, GNU Free Documentation License, Introduction, Top @chapter API Reference @menu @@ -294,31 +295,7 @@ De-references a cairo @var{pattern} object. Further operations on @var{pattern} will produce an error. @end deffn -@node Installation, GNU Free Documentation License, API Reference, Top -@chapter Installation - -Unpack the source and build in the usual way, but do not call -@code{./configure} with a @code{--prefix} argument. This plugin will -be installed in the system library path of the machine run by the -@code{mit-scheme} command. You can override this command name by -setting @code{MIT_SCHEME_EXE}. You can override the system library -path of any machine by passing it the @code{--library} option on the -commandline, or the @code{MITSCHEME_LIBRARY_PATH} variable in the -environment. - -@example - tar xzf mit-scheme-cairo-0.5.tar.gz - cd gtk-0.5 - ./configure - make - make check - make install - make install-info - make install-html - make install-pdf -@end example - -@node GNU Free Documentation License, , Installation, Top +@node GNU Free Documentation License, , API Reference, Top @appendix GNU Free Documentation License @center Version 1.2, November 2002 diff --git a/src/cairo/cairo-optiondb.scm b/src/cairo/optiondb.scm similarity index 78% rename from src/cairo/cairo-optiondb.scm rename to src/cairo/optiondb.scm index 0127e6d5e..367dd40fc 100644 --- a/src/cairo/cairo-optiondb.scm +++ b/src/cairo/optiondb.scm @@ -11,5 +11,5 @@ (further-load-options (merge-pathnames "optiondb" - (last ((access library-directory-path - (->environment '(runtime pathname))))))) \ No newline at end of file + (cadr (access library-directory-path + (->environment '(runtime pathname)))))) \ No newline at end of file