From: George Lebl Date: Wed, 29 May 2002 06:09:00 +0000 (-0800) Subject: Release 1.99.3 X-Git-Tag: v1.99.3 X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/commitdiff_plain/346ae1bbcbbe87e79fe2db1f019f014ea64e2175 Release 1.99.3 --- diff --git a/COPYING.generated-code b/COPYING.generated-code new file mode 100644 index 0000000..82527ab --- /dev/null +++ b/COPYING.generated-code @@ -0,0 +1,505 @@ +This is the license for the generated code. It is the LGPL which you need to comply with anyway in order to link with Glib or GTK+. + - George + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 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 Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + 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 Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +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 other code 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. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + 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, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser 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 combine 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) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) 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. + + d) 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. + + e) 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 materials to be 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 with +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 Lesser 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 Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser 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/ChangeLog b/ChangeLog index fbb99bf..15551ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +Tue May 28 12:09:56 2002 George Lebl + + * Release 1.99.3 + +Tue May 28 11:59:18 2002 George Lebl + + * src/Makefile.am: some compilation voodoo + + * src/main.c: Special case GtkEditable and GTypePlugin since + those end in Class, and all other interfaces should end in + Iface. Long live code consistency! + + * src/main.c: use g_signal_emitv instead of g_signal_emit. This + will allow us to once again have default returns and all that + fun stuff. It should also slightly reduce emission overhead. + +Mon Apr 15 09:55:29 2002 George Lebl + + * README, COPYING.generated-code, Makefile.am: Add LGPL license + for generated code and clarify this in the README. Meant to do + this a long time ago, and told everyone that who asked. Now + it's in writing. + +Sun Apr 14 19:12:02 2002 George Lebl + + * src/parse.y: apply patch from Dennis Bjorklund + to fix export accessors function + Fri Feb 01 15:19:07 2002 George Lebl * Release 1.99.2 diff --git a/Makefile.am b/Makefile.am index c8c5081..ed0463d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ DIST_SUBDIRS = src doc examples m4dir=$(datadir)/aclocal m4_DATA=gob2.m4 -EXTRA_DIST = gob2.spec.in $(m4_DATA) +EXTRA_DIST = gob2.spec.in $(m4_DATA) COPYING.generated-code dist-hook: gob2.spec cp gob2.spec $(distdir) diff --git a/Makefile.in b/Makefile.in index 3bbea28..0b189b9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,7 +84,7 @@ DIST_SUBDIRS = src doc examples m4dir = $(datadir)/aclocal m4_DATA = gob2.m4 -EXTRA_DIST = gob2.spec.in $(m4_DATA) +EXTRA_DIST = gob2.spec.in $(m4_DATA) COPYING.generated-code ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h diff --git a/NEWS b/NEWS index bfd0075..8fd6853 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +1.99.3: + * Fix signal default value + * Special case the interface code to allow implementing + GTypePlugin and GtkEditable interfaces + * Fix export of accessors (Dennis Bjorklund) + * some compilation fixes + 1.99.2: * allow implementation (but not definition yet) of interfaces * enum, flags and GError creation code diff --git a/README b/README index 4ce0a2d..93f7b12 100644 --- a/README +++ b/README @@ -49,10 +49,14 @@ How to include gob2 inside your project: itself. Then just use the made gob2 binary as you would other preprocessors. +License: + - Gob itself is under GPL, the generated code is under LGPL. + See COPYING and COPYING.generated-code + TODO: - clean up code - make it behave nice - add warnings all over the place - - get a life + - get a life (done, hence the lower rate of updates to gob!) George diff --git a/aclocal.m4 b/aclocal.m4 index f7f73ef..cb6ce01 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -202,10 +202,8 @@ AC_DEFUN(PKG_CHECK_MODULES, [ echo "*** to the full path to pkg-config." echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." else - if ! $PKG_CONFIG --atleast-pkgconfig-version 0.7.0; then - echo "*** Your version of pkg-config is too old. You need version 0.7.0 or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then AC_MSG_CHECKING(for $2) if $PKG_CONFIG --exists "$2" ; then @@ -230,6 +228,9 @@ AC_DEFUN(PKG_CHECK_MODULES, [ AC_SUBST($1_CFLAGS) AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" fi fi diff --git a/configure b/configure index 1018214..db8797d 100755 --- a/configure +++ b/configure @@ -1119,7 +1119,7 @@ fi PACKAGE=gob2 -VERSION=1.99.2 +VERSION=1.99.3 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:1125: error: source directory already configured; run \"make distclean\" there first" >&5 @@ -3595,28 +3595,26 @@ fi echo "*** to the full path to pkg-config." echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." else - if ! $PKG_CONFIG --atleast-pkgconfig-version 0.7.0; then - echo "*** Your version of pkg-config is too old. You need version 0.7.0 or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - else - echo "$as_me:3602: checking for glib-2.0 >= $GLIB_REQUIRED" >&5 + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo "$as_me:3600: checking for glib-2.0 >= $GLIB_REQUIRED" >&5 echo $ECHO_N "checking for glib-2.0 >= $GLIB_REQUIRED... $ECHO_C" >&6 if $PKG_CONFIG --exists "glib-2.0 >= $GLIB_REQUIRED" ; then - echo "$as_me:3606: result: yes" >&5 + echo "$as_me:3604: result: yes" >&5 echo "${ECHO_T}yes" >&6 succeeded=yes - echo "$as_me:3610: checking GLIB_CFLAGS" >&5 + echo "$as_me:3608: checking GLIB_CFLAGS" >&5 echo $ECHO_N "checking GLIB_CFLAGS... $ECHO_C" >&6 GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED"` - echo "$as_me:3613: result: $GLIB_CFLAGS" >&5 + echo "$as_me:3611: result: $GLIB_CFLAGS" >&5 echo "${ECHO_T}$GLIB_CFLAGS" >&6 - echo "$as_me:3616: checking GLIB_LIBS" >&5 + echo "$as_me:3614: checking GLIB_LIBS" >&5 echo $ECHO_N "checking GLIB_LIBS... $ECHO_C" >&6 GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED"` - echo "$as_me:3619: result: $GLIB_LIBS" >&5 + echo "$as_me:3617: result: $GLIB_LIBS" >&5 echo "${ECHO_T}$GLIB_LIBS" >&6 else GLIB_CFLAGS="" @@ -3627,13 +3625,16 @@ echo "${ECHO_T}$GLIB_LIBS" >&6 echo $GLIB_PKG_ERRORS fi + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" fi fi if test $succeeded = yes; then : else - { { echo "$as_me:3636: error: Library requirements (glib-2.0 >= $GLIB_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 + { { echo "$as_me:3637: error: Library requirements (glib-2.0 >= $GLIB_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 echo "$as_me: error: Library requirements (glib-2.0 >= $GLIB_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -3718,7 +3719,7 @@ DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:3721: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:3722: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -3894,7 +3895,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:3897: error: ambiguous option: $1 + { { echo "$as_me:3898: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -3913,7 +3914,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:3916: error: unrecognized option: $1 + -*) { { echo "$as_me:3917: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -3963,7 +3964,7 @@ do "doc/gob2.1" ) CONFIG_FILES="$CONFIG_FILES doc/gob2.1" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:3966: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:3967: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -4195,7 +4196,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:4198: creating $ac_file" >&5 + { echo "$as_me:4199: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -4213,7 +4214,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:4216: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:4217: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -4226,7 +4227,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:4229: error: cannot find input file: $f" >&5 + { { echo "$as_me:4230: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -4287,7 +4288,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:4290: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:4291: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -4298,7 +4299,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:4301: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:4302: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -4311,7 +4312,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:4314: error: cannot find input file: $f" >&5 + { { echo "$as_me:4315: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -4428,7 +4429,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:4431: $ac_file is unchanged" >&5 + { echo "$as_me:4432: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/configure.in b/configure.in index 52fc523..f57f83e 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.2) AC_INIT(src/treefuncs.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(gob2,1.99.2) +AM_INIT_AUTOMAKE(gob2,1.99.3) AM_MAINTAINER_MODE GLIB_REQUIRED=1.3.12 diff --git a/gob2.spec b/gob2.spec index 8270b58..fdeb3bc 100644 --- a/gob2.spec +++ b/gob2.spec @@ -1,4 +1,4 @@ -%define ver 1.99.2 +%define ver 1.99.3 %define rel 1 %define prefix /usr diff --git a/src/Makefile.am b/src/Makefile.am index 6a8b829..27d1d6c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,9 @@ DEFS = @DEFS@ \ INCLUDES = \ $(GLIB_CFLAGS) \ -I$(top_builddir) \ + -I$(top_builddir)/src \ -I$(top_srcdir) \ + -I$(top_srcdir)/src \ -I$(includedir) bin_PROGRAMS = @DOINSTGOB@ diff --git a/src/Makefile.in b/src/Makefile.in index f6bbb5b..8146f9b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -87,7 +87,7 @@ CFLAGS = @CFLAGS@ -Wall -Wpointer-arith -Wmissing-prototypes -Wmissing-de DEFS = @DEFS@ -DPKGDATADIR=\"$(pkgdatadir)\" -INCLUDES = $(GLIB_CFLAGS) -I$(top_builddir) -I$(top_srcdir) -I$(includedir) +INCLUDES = $(GLIB_CFLAGS) -I$(top_builddir) -I$(top_builddir)/src -I$(top_srcdir) -I$(top_srcdir)/src -I$(includedir) bin_PROGRAMS = @DOINSTGOB@ diff --git a/src/main.c b/src/main.c index 7613bc0..3909cb0 100644 --- a/src/main.c +++ b/src/main.c @@ -454,7 +454,7 @@ put_signal_macro (const Method *m, gboolean gnu) out_printf (outh, "#define %s_connect_data__%s" "(object,func,data,destroy_data,flags)\t" "g_signal_connect_data(%s(object),\"%s\"," - "(GCallback)(func),(data),(destroy_data),(flags))\n", + "(GCallback)(func),(data),(destroy_data),(GConnectFlags)(flags))\n", funcbase, m->id, macrobase, m->id); } else { /* connect */ @@ -489,7 +489,7 @@ put_signal_macro (const Method *m, gboolean gnu) funcbase, m->id, macrobase, typebase, m->id); print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ", " = (func); ", m, FALSE, TRUE, TRUE); - out_printf (outh, "___%s; }), (data), (destroy_data), (flags))\n", m->id); + out_printf (outh, "___%s; }), (data), (destroy_data), (GConnectFlags)(flags))\n", m->id); } } @@ -1001,13 +1001,25 @@ add_interface_inits (Class *c) for (li = c->interfaces; li != NULL; li = li->next) { const char *interface = li->data; + const char *end; char *name = replace_sep (interface, '_'); char *type = remove_sep (interface); + /* EEEK! evil, we should have some sort of option + * to force this for arbitrary interfaces, since + * some are Class and some are Iface. Glib is shite + * in consistency. */ + if (strcmp (type, "GtkEditable") == 0 || + strcmp (type, "GTypePlugin") == 0) + end = "Class"; + else + /* We'll assume Iface is the standard ending */ + end = "Iface"; + out_printf (out, "\nstatic void\n" - "___%s_init (%sIface *iface)\n" + "___%s_init (%s%s *iface)\n" "{\n", - name, type); + name, type, end); add_interface_methods (c, interface); @@ -2535,11 +2547,21 @@ put_signal_args (Method *m) { GList *li; GList *ali; - for (ali = m->gtktypes->next, li=m->args->next; + int i; + + if (m->args->next == NULL) + return; + + for (ali = m->gtktypes->next, li = m->args->next, i = 1; li != NULL && ali != NULL; - li = li->next, ali = ali->next) { + li = li->next, ali = ali->next, i++) { FuncArg *fa = li->data; char *cast = g_strdup (get_cast (ali->data, FALSE)); + /* FIXME: This code is so fucking ugly it hurts */ + gboolean do_static = + (strcmp ((char *)ali->data, "STRING") == 0 || + strcmp ((char *)ali->data, "BOXED") == 0); + char *set_func; if (cast == NULL) { cast = get_type (fa->atype, TRUE); @@ -2548,9 +2570,20 @@ put_signal_args (Method *m) the we know all the types */ g_assert (cast != NULL); - out_printf (out, ",\n\t\t(%s)%s", cast, - fa->name); + out_printf (out, + "\t___param_values[%d].g_type = 0;\n" + "\tg_value_init (&___param_values[%d], G_TYPE_%s);\n", + i, i, (char *)ali->data); + + set_func = g_strdup_printf ("g_value_set%s_%s", + do_static ? "_static" : "", + (char *)ali->data); + g_strdown (set_func); + + out_printf (out, "\t%s (&___param_values[%d], (%s) %s);\n\n", + set_func, i, cast, fa->name); + g_free (set_func); g_free (cast); } } @@ -2610,38 +2643,87 @@ put_method(Method *m) else /* PUBLIC, PROTECTED */ print_method(out, "", "\n", "", " ", "", "\n", m, FALSE, FALSE, TRUE); - out_addline_outfile(out); - out_printf(out, "{\n"); - s = g_strdup(m->id); - g_strup(s); - if(strcmp(m->mtype->name, "void") == 0 && - m->mtype->pointer == NULL) { - print_preconditions(m); - if(((FuncArg *)m->args->data)->name) - out_printf(out, "\tg_signal_emit (G_OBJECT (%s),\n" - "\t\tobject_signals[%s_SIGNAL], 0", - ((FuncArg *)m->args->data)->name, s); - put_signal_args (m); - out_printf(out, ");\n}\n"); - } else { - out_printf(out, "\t"); - print_type(out, m->mtype, TRUE); - out_printf(out, "return_val = ("); - print_type(out, m->mtype, TRUE); - if(m->defreturn) - out_printf(out, ")(%s);\n", m->defreturn); - else if(m->onerror) - out_printf(out, ")(%s);\n", m->onerror); - else - out_printf(out, ")(0);\n"); - print_preconditions(m); - out_printf(out, "\tg_signal_emit (G_OBJECT (%s),\n" - "\t\tobject_signals[%s_SIGNAL], 0", - ((FuncArg *)m->args->data)->name, s); - put_signal_args(m); - out_printf(out, ",\n\t\t&return_val);\n" - "\treturn return_val;\n}\n"); + out_addline_outfile (out); + + out_printf (out, "{\n"); + + out_printf (out, + "\tGValue ___param_values[%d];\n" + "\tGValue ___return_val = {0};\n\n", + g_list_length (m->args)); + + print_preconditions (m); + + out_printf (out, + "\n\t___param_values[0].g_type = 0;\n" + "\tg_value_init (&___param_values[0], G_TYPE_FROM_INSTANCE (%s));\n" + "\tg_value_set_instance (&___param_values[0], (gpointer) %s);\n\n", + ((FuncArg *)m->args->data)->name, + ((FuncArg *)m->args->data)->name); + + put_signal_args (m); + + if (strcmp (m->gtktypes->data, "NONE") != 0) { + const char *defret = NULL; + + out_printf (out, "\tg_value_init (&___return_val, G_TYPE_%s);\n", + (char *)m->gtktypes->data); + + if (m->defreturn != NULL) + defret = m->defreturn; + else if (m->onerror != NULL) + defret = m->onerror; + + if (defret != NULL) { + char *set_func; + /* FIXME: This code is so fucking ugly it hurts */ + gboolean do_static = + (strcmp ((char *)m->gtktypes->data, "STRING") == 0 || + strcmp ((char *)m->gtktypes->data, "BOXED") == 0); + char *cast = g_strdup (get_cast (m->gtktypes->data, FALSE)); + if (cast == NULL) + cast = get_type (m->mtype, TRUE); + + set_func = g_strdup_printf ("g_value_set%s_%s", + do_static ? "_static" : "", + (char *)m->gtktypes->data); + g_strdown (set_func); + + out_printf (out, "\t%s (&___return_val, (%s) (%s));\n", + set_func, cast, defret); + + g_free (set_func); + g_free (cast); + } + out_printf (out, "\n"); + } + + s = g_strdup (m->id); + g_strup (s); + + out_printf(out, "\tg_signal_emitv (___param_values,\n" + "\t\tobject_signals[%s_SIGNAL],\n" + "\t\t0 /* detail */,\n" + "\t\t&___return_val);\n", s); + + g_free (s); + + if (strcmp (m->gtktypes->data, "NONE") != 0) { + char *cast = g_strdup (get_cast (m->gtktypes->data, FALSE)); + char *getfunc = g_strdup_printf ("g_value_get_%s", + (char *)m->gtktypes->data); + g_strdown (getfunc); + + if (cast == NULL) + cast = get_type (m->mtype, TRUE); + + out_printf (out, "\n\treturn (%s) %s (&___return_val);\n", + cast, getfunc); + + g_free (cast); + g_free (getfunc); } + out_printf(out, "}\n"); if(!m->cbuf) break; diff --git a/src/parse.c b/src/parse.c index b9f0a27..a7c88bf 100644 --- a/src/parse.c +++ b/src/parse.c @@ -386,8 +386,8 @@ set_return_value(char *type, char *val) static void export_accessors (const char *var_name, gboolean do_get, - gboolean do_set, int get_lineno, + gboolean do_set, int set_lineno, Type *type, const char *gtktype, @@ -580,7 +580,7 @@ property_link_and_export (Node *node) if (prop->export) { export_accessors (prop->name, prop->get != NULL, prop->get_line, - prop->set != NULL, prop->get_line, + prop->set != NULL, prop->set_line, prop->ptype, prop->gtktype, prop->line_no); diff --git a/src/parse.y b/src/parse.y index a8d3341..7ad3af5 100644 --- a/src/parse.y +++ b/src/parse.y @@ -349,8 +349,8 @@ set_return_value(char *type, char *val) static void export_accessors (const char *var_name, gboolean do_get, - gboolean do_set, int get_lineno, + gboolean do_set, int set_lineno, Type *type, const char *gtktype, @@ -543,7 +543,7 @@ property_link_and_export (Node *node) if (prop->export) { export_accessors (prop->name, prop->get != NULL, prop->get_line, - prop->set != NULL, prop->get_line, + prop->set != NULL, prop->set_line, prop->ptype, prop->gtktype, prop->line_no);