Plugins GTK 2.8 build test failed at: waf build
See http://nightly.geany.org/misc/build_gtk28_plugins_stderr.log for details.
Error messages:
../../gtk28_test_plugins/codenav/src/codenavigation.c: In function 'switch_menu_item_activate':
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: 'g_strcmp0' undeclared (first use in this function)
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: (Each undeclared identifier is reported only once
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
...
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
../../gtk28_test_plugins/codenav/src/codenavigation.c:251: warning: comparison between signed and unsigned
../../gtk28_test_plugins/codenav/src/codenavigation.c:260: warning: implicit declaration of function 'g_strcmp0'
../../gtk28_test_plugins/codenav/src/codenavigation.c:311: warning: ISO C90 forbids mixed declarations and code
Build failed
-> task failed (err #1):
{task: cc codenavigation.c -> codenavigation_2.o}
http://nightly.geany.org/
Plugins Windows build failed at: waf build
See http://nightly.geany.org/win32/build_win32_plugins_stderr.log for details.
Error messages:
../../plugins_svn/codenav/src/codenavigation.c: In function `switch_menu_item_activate':
../../plugins_svn/codenav/src/codenavigation.c:251: warning: comparison between signed and unsigned
../../plugins_svn/codenav/src/codenavigation.c:315: warning: ISO C90 forbids mixed declarations and code
../../plugins_svn/geanylua/glspi_run.c: In function `debug_hook':
...
../../plugins_svn/geanyprj/src/sidebar.c:278: warning: ISO C90 forbids mixed declarations and code
default/geanyprj/src/utils_11.o: In function `save_config':
/home/enrico/geany/_build_/plugins_win32/../../plugins_svn/geanyprj/src/utils.c:170: undefined reference to `_utils_write_file'
collect2: ld returned 1 exit status
Build failed
-> task failed (err #1):
{task: cc_link geanyprj_11.o,menu_11.o,project_11.o,sidebar_11.o,utils_11.o,xproject_11.o -> geanyprj.dll}
http://nightly.geany.org/
Revision: 923
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=923&view=rev
Author: yurand
Date: 2009-09-08 11:30:18 +0000 (Tue, 08 Sep 2009)
Log Message:
-----------
Remove geanyprj, geanydoc from old location
Removed Paths:
-------------
trunk/geanydoc/
trunk/geanyprj/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 922
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=922&view=rev
Author: yurand
Date: 2009-09-08 11:28:33 +0000 (Tue, 08 Sep 2009)
Log Message:
-----------
geanyprj is added to common build system
Modified Paths:
--------------
trunk/geany-plugins/Makefile.am
trunk/geany-plugins/configure.ac
trunk/geany-plugins/po/POTFILES.in
trunk/geany-plugins/wscript
Added Paths:
-----------
trunk/geany-plugins/build/geanyprj.m4
trunk/geany-plugins/geanyprj/
trunk/geany-plugins/geanyprj/AUTHORS
trunk/geany-plugins/geanyprj/COPYING
trunk/geany-plugins/geanyprj/ChangeLog
trunk/geany-plugins/geanyprj/Makefile.am
trunk/geany-plugins/geanyprj/NEWS
trunk/geany-plugins/geanyprj/README
trunk/geany-plugins/geanyprj/THANKS
trunk/geany-plugins/geanyprj/TODO
trunk/geany-plugins/geanyprj/src/
trunk/geany-plugins/geanyprj/src/Makefile.am
trunk/geany-plugins/geanyprj/src/geanyprj.c
trunk/geany-plugins/geanyprj/src/geanyprj.h
trunk/geany-plugins/geanyprj/src/menu.c
trunk/geany-plugins/geanyprj/src/project.c
trunk/geany-plugins/geanyprj/src/sidebar.c
trunk/geany-plugins/geanyprj/src/utils.c
trunk/geany-plugins/geanyprj/src/xproject.c
trunk/geany-plugins/geanyprj/tests/
trunk/geany-plugins/geanyprj/tests/Makefile.am
trunk/geany-plugins/geanyprj/tests/unittests.c
Modified: trunk/geany-plugins/Makefile.am
===================================================================
--- trunk/geany-plugins/Makefile.am 2009-09-08 10:35:13 UTC (rev 921)
+++ trunk/geany-plugins/Makefile.am 2009-09-08 11:28:33 UTC (rev 922)
@@ -1,10 +1,12 @@
plugins = \
addons \
codenav \
+ geanydoc \
geanygdb \
geanylatex \
geanylipsum \
geanylua \
+ geanyprj \
geanysendmail \
geanyvc \
pretty-printer \
Added: trunk/geany-plugins/build/geanyprj.m4
===================================================================
--- trunk/geany-plugins/build/geanyprj.m4 (rev 0)
+++ trunk/geany-plugins/build/geanyprj.m4 2009-09-08 11:28:33 UTC (rev 922)
@@ -0,0 +1,9 @@
+AC_DEFUN([GP_CHECK_GEANYPRJ],
+[
+ GP_STATUS_PLUGIN_ADD([GeanyPrj], [yes])
+ AC_CONFIG_FILES([
+ geanyprj/Makefile
+ geanyprj/src/Makefile
+ geanyprj/tests/Makefile
+ ])
+])
Modified: trunk/geany-plugins/configure.ac
===================================================================
--- trunk/geany-plugins/configure.ac 2009-09-08 10:35:13 UTC (rev 921)
+++ trunk/geany-plugins/configure.ac 2009-09-08 11:28:33 UTC (rev 922)
@@ -26,6 +26,7 @@
GP_CHECK_GEANYLATEX
GP_CHECK_GEANYLIPSUM
GP_CHECK_GEANYLUA
+GP_CHECK_GEANYPRJ
GP_CHECK_GEANYSENDMAIL
GP_CHECK_GEANYVC
GP_CHECK_PRETTYPRINTER
Added: trunk/geany-plugins/geanyprj/AUTHORS
===================================================================
--- trunk/geany-plugins/geanyprj/AUTHORS (rev 0)
+++ trunk/geany-plugins/geanyprj/AUTHORS 2009-09-08 11:28:33 UTC (rev 922)
@@ -0,0 +1 @@
+Yura Siamashka <yurand2(a)gmail.com>
Added: trunk/geany-plugins/geanyprj/COPYING
===================================================================
--- trunk/geany-plugins/geanyprj/COPYING (rev 0)
+++ trunk/geany-plugins/geanyprj/COPYING 2009-09-08 11:28:33 UTC (rev 922)
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, 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
+them 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 prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU 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
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program 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 3 of the License, or
+ (at your option) any later version.
+
+ This program 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 program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Added: trunk/geany-plugins/geanyprj/Makefile.am
===================================================================
--- trunk/geany-plugins/geanyprj/Makefile.am (rev 0)
+++ trunk/geany-plugins/geanyprj/Makefile.am 2009-09-08 11:28:33 UTC (rev 922)
@@ -0,0 +1,4 @@
+include $(top_srcdir)/build/vars.auxfiles.mk
+
+SUBDIRS = src tests
+plugin = geanyprj
Added: trunk/geany-plugins/geanyprj/NEWS
===================================================================
--- trunk/geany-plugins/geanyprj/NEWS (rev 0)
+++ trunk/geany-plugins/geanyprj/NEWS 2009-09-08 11:28:33 UTC (rev 922)
@@ -0,0 +1 @@
+See "README"
Added: trunk/geany-plugins/geanyprj/README
===================================================================
--- trunk/geany-plugins/geanyprj/README (rev 0)
+++ trunk/geany-plugins/geanyprj/README 2009-09-08 11:28:33 UTC (rev 922)
@@ -0,0 +1,171 @@
+.. |(version)| replace:: 0.6
+
+========
+geanyprj
+========
+
+.. contents::
+
+About
+=====
+
+geanyprj is alternative project manager for Geany fast light IDE. In order to use it
+you need Geany 0.16.
+
+Why it was created?
+-------------------
+
+Open source is great, there are a lot of nice sources that you can use for your projects
+in Internet. But there are also a lot of crappy sources and when you want steal something
+you need to check if it is good or not. Ability to jump to definition/declaration and back is
+great help for such task. But no other text editor or IDE I know allow this without a lot of setuping.
+You have to create/import project add files. When you finish with one project
+you need to close it and repeat procedure for all other. Great time wasting. If you are checking
+about 10 potential places you want steal code from, you won't create any project and don't
+get "jump to definition/declaration" just because it is too much bother.
+
+geanyprj aims to provide "jump to definition/declaration" functions with as little setup as possible.
+
+Why different project manager, why don't improve existing code in Geany?
+------------------------------------------------------------------------
+
+That's because current project manager in Genny more about sessions. It is not something real
+project manager should do (IMHO). It allow/require user manually open/close project and allow
+to store project files in different locations from project sources.
+
+geanyprj takes different approach:
+
+1) Never save session information (this way project files can be stored in version control without
+constant noise from changes of opened files or cursor position)
+
+2) Never open/close project manually. If .geanyprj file is found somewhere up in path it will be
+opened automatically.
+
+Usage
+=====
+
+geanyprj add "Tools->Project" menu and sidebar "Project" tab.
+
+Project properties
+------------------
+
+Name - This is just project name you will see it in status window on open/close project.
+
+Location - This is directory where .geanyprj file will be saved.
+
+Base Path - If defined Geany will use this directory as current directory for make and run commands
+
+Generate file list on load - This option tell Geany to recreate project file list on project load using
+selected type. If it is unchecked you should manually select files you want to be parsed by tagmanager.
+
+Type - This is type of files that needed to be parsed by tagmanager.
+
+ * All - All files that is known to Geany
+ * C/C++ - This match any C or C++ files (.c, .cpp, .cxx, .h etc.)
+ * C - This match only C files (.c, .h)
+ * Python - This match python files (.py)
+ * None - This doesn't match any files
+
+
+Example of usage
+----------------
+
+Lets see plugin work at Geany source code example:
+
+1) Download geany-0.15.tar.gz (http://prdownloads.sourceforge.net/geany/geany-0.15.tar.gz?download)
+
+2) Unpack it somewhere, for example in ~/src/geany-0.15
+
+3) Open ~/src/geany-0.15/configure.in
+
+4) Click "Tools->Project->New Project", and click "Create" button
+
+ This will create and save .geanyprj file in ~/src/geany-0.15. From now, every time you
+ open file from ~/src/geany-0.15 dirrectory or it's subdirrectory .geanyprj will be opened.
+ So next time you don't have to create or open project manually.
+
+5) Open any geany source code code file
+
+ "go to tag declaration/definition" should work for any geany function. (Not limited to opened files).
+
+6) Now you open file that doesn't belong to Geany. For example ~/src/myprj/a.c Geany project will be closed. If ~/src/myprj/.geanyprj exists it will be opened as current project.
+
+7) Switching back to any Geany file will open Geany project again.
+
+
+License
+=======
+
+geanyprj is distributed under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 3 of the
+License, or (at your option) any later version. A copy of this license
+can be found in the file COPYING included with the source code of this
+program.
+
+Ideas, questions, patches and bug reports
+=========================================
+
+If you add something, or fix a bug, please send a patch (in 'diff -u'
+format) to the geany mailing list or to one of the authors listed bellow.
+
+Coding
+======
+
+Use static functions where possible.
+Try to use GLib types and functions - e.g. g_free instead of free and
+try to use only GLib 2.6 and GTK 2.6 functions.
+
+Style
+=====
+
+The file indent-all.sh contains information about
+the current code style. Run this script before commit.
+
+Download
+========
+
+The current version is:
+
+============= ================ ============================================================
+Geany Version GeanyPrj Version Download
+============= ================ ============================================================
+0.16 |(version)| http://users.cosmostv.by/yurand/geanyprj/geanyprj-0.5.tar.gz
+============= ================ ============================================================
+
+Up to date source code can be downloaded here::
+
+ svn checkout http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geanyp…
+
+If you have old version of Geany installed you need old version of plugin as well. These versions of plugin
+are no longer supported and if you find bug in one of them, it won't be fixed unless you do it yourself.
+
+============= ================ ============================================================
+Geany Version GeanyPrj Version Download
+============= ================ ============================================================
+0.16 0.5 http://users.cosmostv.by/yurand/geanyprj/geanyprj-0.5.tar.gz
+
+0.15 0.4 http://users.cosmostv.by/yurand/geanyprj/geanyprj-0.4.tar.gz
+
+0.14 0.3 http://users.cosmostv.by/yurand/geanyprj/geanyprj-0.3.tar.gz
+
+0.13 0.2 http://users.cosmostv.by/yurand/geanyprj/geanyprj-0.2.tar.gz
+============= ================ ============================================================
+
+
+Gentoo
+------
+
+Gentoo ebuild is available here: http://bugs.gentoo.org/show_bug.cgi?id=218506
+
+Arch linux
+----------
+
+A package for Arch Linux is available here: http://aur.archlinux.org/packages.php?ID=16477
+
+Windows
+-------
+
+A windows installer is available here: http://users.cosmostv.by/yurand/geanyprj/geanyprj-0.5_setup.exe
+
+2007-2008 by Yura Siamashka
+yurand2(at)gmail(dot)com
Added: trunk/geany-plugins/geanyprj/TODO
===================================================================
--- trunk/geany-plugins/geanyprj/TODO (rev 0)
+++ trunk/geany-plugins/geanyprj/TODO 2009-09-08 11:28:33 UTC (rev 922)
@@ -0,0 +1,3 @@
+* Sort the files listed on the 'Project' tab
+* Fix utf8 and local encoding of filenames.
+* 'Find usage' support
\ No newline at end of file
Added: trunk/geany-plugins/geanyprj/src/Makefile.am
===================================================================
--- trunk/geany-plugins/geanyprj/src/Makefile.am (rev 0)
+++ trunk/geany-plugins/geanyprj/src/Makefile.am 2009-09-08 11:28:33 UTC (rev 922)
@@ -0,0 +1,13 @@
+include $(top_srcdir)/build/vars.build.mk
+
+geanyplugins_LTLIBRARIES = geanyprj.la
+geanyprj_la_SOURCES = geanyprj.c \
+ geanyprj.h \
+ menu.c \
+ project.c \
+ sidebar.c \
+ utils.c \
+ xproject.c
+
+geanyprj_la_CFLAGS = $(AM_CFLAGS)
+geanyprj_la_LIBADD = $(COMMONLIBS)
Added: trunk/geany-plugins/geanyprj/src/geanyprj.c
===================================================================
--- trunk/geany-plugins/geanyprj/src/geanyprj.c (rev 0)
+++ trunk/geany-plugins/geanyprj/src/geanyprj.c 2009-09-08 11:28:33 UTC (rev 922)
@@ -0,0 +1,173 @@
+/*
+ * geanyprj - Alternative project support for geany light IDE.
+ *
+ * Copyright 2007 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+ * Copyright 2007 Enrico Tröger <enrico.troeger(a)uvena.de>
+ * Copyright 2007 Nick Treleaven <nick.treleaven(a)btinternet.com>
+ * Copyright 2007,2008 Yura Siamashka <yurand2(a)gmail.com>
+ *
+ * This program 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <sys/time.h>
+#include <string.h>
+
+#include "geany.h"
+#include "support.h"
+#include "plugindata.h"
+#include "document.h"
+#include "filetypes.h"
+#include "utils.h"
+#include "ui_utils.h"
+#include "geanyfunctions.h"
+
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif
+
+#include "project.h"
+
+#include "geanyprj.h"
+
+PLUGIN_VERSION_CHECK(115);
+PLUGIN_SET_INFO(_("Project"), _("Alternative project support."), VERSION,
+ _("Yura Siamashka <yurand2(a)gmail.com>"));
+
+GeanyData *geany_data;
+GeanyFunctions *geany_functions;
+
+static void
+reload_project()
+{
+ gchar *dir;
+ gchar *proj;
+ GeanyDocument *doc;
+
+ debug("%s\n", __FUNCTION__);
+
+ doc = document_get_current();
+ if (doc == NULL || doc->file_name == NULL)
+ return;
+
+ dir = g_path_get_dirname(doc->file_name);
+ proj = find_file_path(dir, ".geanyprj");
+
+ if (!proj)
+ {
+ if (g_current_project)
+ xproject_close(TRUE);
+ return;
+ }
+
+ if (!g_current_project)
+ {
+ xproject_open(proj);
+ }
+ else if (strcmp(proj, g_current_project->path) != 0)
+ {
+ xproject_close(TRUE);
+ xproject_open(proj);
+ }
+ if (proj)
+ g_free(proj);
+}
+
+static void
+on_doc_save(G_GNUC_UNUSED GObject * obj, GeanyDocument * doc, G_GNUC_UNUSED gpointer user_data)
+{
+ gchar *name;
+
+ g_return_if_fail(doc != NULL && doc->file_name != NULL);
+
+ name = g_path_get_basename(doc->file_name);
+ if (g_current_project && strcmp(name, ".geanyprj") == 0)
+ {
+ xproject_close(FALSE);
+ }
+ reload_project();
+ xproject_update_tag(doc->file_name);
+}
+
+static void
+on_doc_open(G_GNUC_UNUSED GObject * obj, G_GNUC_UNUSED GeanyDocument * doc,
+ G_GNUC_UNUSED gpointer user_data)
+{
+ reload_project();
+}
+
+static void
+on_doc_activate(G_GNUC_UNUSED GObject * obj, G_GNUC_UNUSED GeanyDocument * doc,
+ G_GNUC_UNUSED gpointer user_data)
+{
+ reload_project();
+}
+
+PluginCallback plugin_callbacks[] = {
+ {"document-open", (GCallback) & on_doc_open, TRUE, NULL},
+ {"document-save", (GCallback) & on_doc_save, TRUE, NULL},
+ {"document-activate", (GCallback) & on_doc_activate, TRUE, NULL},
+ {NULL, NULL, FALSE, NULL}
+};
+
+static void
+locale_init(void)
+{
+#ifdef ENABLE_NLS
+ gchar *locale_dir = NULL;
+
+#ifdef HAVE_LOCALE_H
+ setlocale(LC_ALL, "");
+#endif
+
+#ifdef G_OS_WIN32
+ gchar *install_dir = g_win32_get_package_installation_directory("geany", NULL);
+ /* e.g. C:\Program Files\geany\lib\locale */
+ locale_dir = g_strconcat(install_dir, "\\share\\locale", NULL);
+ g_free(install_dir);
+#else
+ locale_dir = g_strdup(LOCALEDIR);
+#endif
+
+ bindtextdomain(GETTEXT_PACKAGE, locale_dir);
+ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+ textdomain(GETTEXT_PACKAGE);
+ g_free(locale_dir);
+#endif
+}
+
+/* Called by Geany to initialize the plugin */
+void
+plugin_init(G_GNUC_UNUSED GeanyData * data)
+{
+ locale_init();
+ tools_menu_init();
+
+ xproject_init();
+ create_sidebar();
+ reload_project();
+}
+
+/* Called by Geany before unloading the plugin. */
+void
+plugin_cleanup()
+{
+ tools_menu_uninit();
+
+ if (g_current_project)
+ geany_project_free(g_current_project);
+ g_current_project = NULL;
+
+ xproject_cleanup();
+ destroy_sidebar();
+}
Added: trunk/geany-plugins/geanyprj/src/geanyprj.h
===================================================================
--- trunk/geany-plugins/geanyprj/src/geanyprj.h (rev 0)
+++ trunk/geany-plugins/geanyprj/src/geanyprj.h 2009-09-08 11:28:33 UTC (rev 922)
@@ -0,0 +1,135 @@
+/*
+ * geanyprj - Alternative project support for geany light IDE.
+ *
+ * Copyright 2008 Yura Siamashka <yurand2(a)gmail.com>
+ *
+ * This program 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GEANYPRJ_H__
+#define __GEANYPRJ_H__
+
+#ifdef __GNUC__
+# ifdef DEBUG
+# define debug(format, ...) printf((format), __VA_ARGS__)
+# else
+# define debug(...)
+# endif
+#else
+# ifdef DEBUG
+# define debug printf
+# else
+# define debug
+# endif
+#endif
+
+#define MAX_NAME_LEN 50
+#define PROJECT_TYPE 1
+
+enum
+{
+ NEW_PROJECT_TYPE_ALL,
+ NEW_PROJECT_TYPE_CPP,
+ NEW_PROJECT_TYPE_C,
+ NEW_PROJECT_TYPE_PYTHON,
+ NEW_PROJECT_TYPE_NONE,
+ NEW_PROJECT_TYPE_SIZE
+};
+
+struct GeanyPrj
+{
+ gchar *path; ///< path to disk file
+
+ gchar *name;
+ gchar *description;
+ gchar *base_path;
+ gchar *run_cmd;
+
+ gboolean regenerate;
+ gint type;
+
+ GHashTable *tags; ///< project tags
+};
+
+
+extern const gchar *project_type_string[NEW_PROJECT_TYPE_SIZE];
+extern void *project_type_filter[NEW_PROJECT_TYPE_SIZE];
+
+// project.c
+struct GeanyPrj *geany_project_new();
+struct GeanyPrj *geany_project_load(const gchar * path);
+void geany_project_free(struct GeanyPrj *prj);
+
+void geany_project_regenerate_file_list(struct GeanyPrj *prj);
+
+gboolean geany_project_add_file(struct GeanyPrj *prj, const gchar * path);
+gboolean geany_project_remove_file(struct GeanyPrj *prj, const gchar * path);
+void geany_project_save(struct GeanyPrj *prj);
+
+void geany_project_set_path(struct GeanyPrj *prj, const gchar * path);
+void geany_project_set_name(struct GeanyPrj *prj, const gchar * name);
+void geany_project_set_type_int(struct GeanyPrj *prj, gint val);
+void geany_project_set_type_string(struct GeanyPrj *prj, const gchar * val);
+void geany_project_set_regenerate(struct GeanyPrj *prj, gboolean val);
+
+void geany_project_set_description(struct GeanyPrj *prj, const gchar * description);
+void geany_project_set_base_path(struct GeanyPrj *prj, const gchar * base_path);
+void geany_project_set_run_cmd(struct GeanyPrj *prj, const gchar * run_cmd);
+
+void geany_project_set_tags_from_list(struct GeanyPrj *prj, GSList * files);
+
+
+// sidebar.c
+void create_sidebar();
+void destroy_sidebar();
+
+void sidebar_refresh();
+
+
+// xproject.c
+void xproject_init();
+void xproject_open(const gchar * path);
+gboolean xproject_add_file(const gchar * path);
+gboolean xproject_remove_file(const gchar * path);
+void xproject_update_tag(const gchar * filename);
+void xproject_cleanup();
+void xproject_close(gboolean cache);
+
+// menu.h
+void tools_menu_init();
+void tools_menu_uninit();
+
+void on_new_project(GtkMenuItem * menuitem, gpointer user_data);
+void on_preferences(GtkMenuItem * menuitem, gpointer user_data);
+void on_delete_project(GtkMenuItem * menuitem, gpointer user_data);
+void on_add_file(GtkMenuItem * menuitem, gpointer user_data);
+void on_find_in_project(GtkMenuItem * menuitem, gpointer user_data);
+
+
+
+// utils.c
+gchar *find_file_path(const gchar * dir, const gchar * filename);
+gchar *normpath(const gchar * filename);
+gchar *get_full_path(const gchar * location, const gchar * path);
+gchar *get_relative_path(const gchar * location, const gchar * path);
+
+gint config_length(GKeyFile * config, const gchar * section, const gchar * name);
+void save_config(GKeyFile * config, const gchar * path);
+GSList *get_file_list(const gchar * path, guint * length, gboolean(*func) (const gchar *),
+ GError ** error);
+
+
+extern struct GeanyPrj *g_current_project;
+
+#endif
Added: trunk/geany-plugins/geanyprj/src/menu.c
===================================================================
--- trunk/geany-plugins/geanyprj/src/menu.c (rev 0)
+++ trunk/geany-plugins/geanyprj/src/menu.c 2009-09-08 11:28:33 UTC (rev 922)
@@ -0,0 +1,455 @@
+/*
+ * geanyprj - Alternative project support for geany light IDE.
+ *
+ * Copyright 2008 Yura Siamashka <yurand2(a)gmail.com>
+ *
+ * This program 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <sys/time.h>
+#include <gdk/gdkkeysyms.h>
+#include <glib/gstdio.h>
+
+#include "geany.h"
+#include "support.h"
+#include "prefs.h"
+#include "plugindata.h"
+#include "document.h"
+#include "filetypes.h"
+#include "keybindings.h"
+#include "utils.h"
+#include "ui_utils.h"
+#include "geanyfunctions.h"
+
+#include "project.h"
+
+#include "geanyprj.h"
+
+PluginFields *plugin_fields;
+extern GeanyData *geany_data;
+extern GeanyFunctions *geany_functions;
+
+
+static struct
+{
+ GtkWidget *new_project;
+ GtkWidget *delete_project;
+
+ GtkWidget *add_file;
+
+ GtkWidget *preferences;
+
+ GtkWidget *find_in_files;
+} menu_items;
+
+// simple struct to keep references to the elements of the properties dialog
+typedef struct _PropertyDialogElements
+{
+ GtkWidget *dialog;
+ GtkWidget *name;
+ GtkWidget *description;
+ GtkWidget *file_name;
+ GtkWidget *base_path;
+ GtkWidget *make_in_base_path;
+ GtkWidget *run_cmd;
+ GtkWidget *regenerate;
+ GtkWidget *type;
+ GtkWidget *patterns;
+} PropertyDialogElements;
+
+static PropertyDialogElements *
+build_properties_dialog(gboolean properties)
+{
+ GtkWidget *vbox;
+ GtkWidget *table;
+ GtkWidget *image;
+ GtkWidget *button;
+ GtkWidget *bbox;
+ GtkWidget *label;
+ GtkTooltips *tooltips =
+ GTK_TOOLTIPS(ui_lookup_widget(geany->main_widgets->window, "tooltips"));
+ PropertyDialogElements *e;
+ gchar *dir = NULL;
+ gchar *basename = NULL;
+ gint i;
+ GeanyDocument *doc;
+
+ doc = document_get_current();
+
+ if (doc && doc->file_name != NULL && g_path_is_absolute(doc->file_name))
+ {
+ dir = g_path_get_dirname(doc->file_name);
+ }
+ else
+ {
+ dir = g_strdup("");
+ }
+ basename = g_path_get_basename(dir);
+
+ e = g_new0(PropertyDialogElements, 1);
+
+ if (properties)
+ {
+ e->dialog =
+ gtk_dialog_new_with_buttons(_("Project Preferences"),
+ GTK_WINDOW(geany->main_widgets->window),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+ }
+ else
+ {
+ e->dialog =
+ gtk_dialog_new_with_buttons(_("New Project"),
+ GTK_WINDOW(geany->main_widgets->window),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
+
+ gtk_widget_set_name(e->dialog, "GeanyDialogProject");
+ bbox = gtk_hbox_new(FALSE, 0);
+ button = gtk_button_new();
+ image = gtk_image_new_from_stock("gtk-new", GTK_ICON_SIZE_BUTTON);
+ label = gtk_label_new_with_mnemonic(_("C_reate"));
+ gtk_box_pack_start(GTK_BOX(bbox), image, FALSE, FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(button), bbox);
+ gtk_dialog_add_action_widget(GTK_DIALOG(e->dialog), button, GTK_RESPONSE_OK);
+ }
+
+ vbox = ui_dialog_vbox_new(GTK_DIALOG(e->dialog));
+
+ table = gtk_table_new(5, 2, FALSE);
+ gtk_table_set_row_spacings(GTK_TABLE(table), 5);
+ gtk_table_set_col_spacings(GTK_TABLE(table), 10);
+
+ label = gtk_label_new(_("Name:"));
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0);
+
+ e->name = gtk_entry_new();
+ gtk_entry_set_max_length(GTK_ENTRY(e->name), MAX_NAME_LEN);
+ gtk_entry_set_text(GTK_ENTRY(e->name), basename);
+
+ ui_table_add_row(GTK_TABLE(table), 0, label, e->name, NULL);
+
+ label = gtk_label_new(_("Location:"));
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0);
+ e->file_name = gtk_entry_new();
+ gtk_entry_set_width_chars(GTK_ENTRY(e->file_name), 30);
+
+ if (properties)
+ {
+ gtk_widget_set_sensitive(e->file_name, FALSE);
+ ui_table_add_row(GTK_TABLE(table), 1, label, e->file_name, NULL);
+ }
+ else
+ {
+ button = gtk_button_new();
+ image = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON);
+ gtk_container_add(GTK_CONTAINER(button), image);
+ bbox = ui_path_box_new(_("Choose Project Location"),
+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+ GTK_ENTRY(e->file_name));
+ gtk_entry_set_text(GTK_ENTRY(e->file_name), dir);
+ ui_table_add_row(GTK_TABLE(table), 1, label, bbox, NULL);
+ }
+
+
+ label = gtk_label_new(_("Base path:"));
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0);
+
+ e->base_path = gtk_entry_new();
+ gtk_tooltips_set_tip(tooltips, e->base_path,
+ _("Base directory of all files that make up the project. "
+ "This can be a new path, or an existing directory tree. "
+ "You can use paths relative to the project filename."), NULL);
+ bbox = ui_path_box_new(_("Choose Project Base Path"),
+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_ENTRY(e->base_path));
+ gtk_entry_set_text(GTK_ENTRY(e->base_path), dir);
+
+ ui_table_add_row(GTK_TABLE(table), 2, label, bbox, NULL);
+
+ label = gtk_label_new(_(""));
+ e->regenerate = gtk_check_button_new_with_label(_("Generate file list on load"));
+ gtk_tooltips_set_tip(tooltips, e->regenerate,
+ _("Automatically add files that match project type on project load "
+ "automaticly. You can't manually add/remove files if "
+ "you checked this option, since your modification will be lost on "
+ "on next project load"), NULL);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(e->regenerate), TRUE);
+ ui_table_add_row(GTK_TABLE(table), 3, label, e->regenerate, NULL);
+
+
+ label = gtk_label_new(_("Type:"));
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0);
+
+ e->type = gtk_combo_box_new_text();
+ for (i = 0; i < NEW_PROJECT_TYPE_SIZE; i++)
+ gtk_combo_box_append_text(GTK_COMBO_BOX(e->type), project_type_string[i]);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(e->type), 0);
+
+ ui_table_add_row(GTK_TABLE(table), 4, label, e->type, NULL);
+
+ gtk_container_add(GTK_CONTAINER(vbox), table);
+ g_free(dir);
+ g_free(basename);
+
+ return e;
+}
+
+void
+on_new_project(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data)
+{
+ PropertyDialogElements *e;
+ gint response;
+
+ e = build_properties_dialog(FALSE);
+ gtk_widget_show_all(e->dialog);
+
+ retry:
+ response = gtk_dialog_run(GTK_DIALOG(e->dialog));
+ if (response == GTK_RESPONSE_OK)
+ {
+ gchar *path;
+ struct GeanyPrj *prj;
+
+ path = g_build_filename(gtk_entry_get_text(GTK_ENTRY(e->file_name)), ".geanyprj",
+ NULL);
+
+ if (g_file_test(path, G_FILE_TEST_EXISTS))
+ {
+ ui_set_statusbar(TRUE, _("Project file \"%s\" already exists"), path);
+ g_free(path);
+ goto retry;
+ }
+ prj = geany_project_new();
+
+ geany_project_set_path(prj, path);
+ geany_project_set_base_path(prj, gtk_entry_get_text(GTK_ENTRY(e->base_path)));
+ geany_project_set_name(prj, gtk_entry_get_text(GTK_ENTRY(e->name)));
+ geany_project_set_description(prj, "");
+ geany_project_set_run_cmd(prj, "");
+ geany_project_set_type_int(prj, gtk_combo_box_get_active(GTK_COMBO_BOX(e->type)));
+ geany_project_set_regenerate(prj,
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON
+ (e->regenerate)));
+
+ geany_project_regenerate_file_list(prj);
+
+ geany_project_save(prj);
+ geany_project_free(prj);
+ document_open_file(path, FALSE, NULL, NULL);
+ }
+
+ gtk_widget_destroy(e->dialog);
+ g_free(e);
+}
+
+void
+on_preferences(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data)
+{
+ PropertyDialogElements *e;
+ gint response;
+ gchar *project_dir;
+
+ e = build_properties_dialog(TRUE);
+
+ project_dir = g_path_get_dirname(g_current_project->path);
+ gtk_entry_set_text(GTK_ENTRY(e->file_name), project_dir);
+ gtk_entry_set_text(GTK_ENTRY(e->name), g_current_project->name);
+ gtk_entry_set_text(GTK_ENTRY(e->base_path), g_current_project->base_path);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(e->type), g_current_project->type);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(e->regenerate),
+ g_current_project->regenerate);
+
+ gtk_widget_show_all(e->dialog);
+
+ response = gtk_dialog_run(GTK_DIALOG(e->dialog));
+ if (response == GTK_RESPONSE_OK)
+ {
+ geany_project_set_base_path(g_current_project,
+ gtk_entry_get_text(GTK_ENTRY(e->base_path)));
+ geany_project_set_name(g_current_project, gtk_entry_get_text(GTK_ENTRY(e->name)));
+ geany_project_set_description(g_current_project, "");
+ geany_project_set_run_cmd(g_current_project, "");
+ geany_project_set_type_int(g_current_project,
+ gtk_combo_box_get_active(GTK_COMBO_BOX(e->type)));
+ geany_project_set_regenerate(g_current_project,
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON
+ (e->regenerate)));
+ geany_project_save(g_current_project);
+
+ if (g_current_project->regenerate)
+ {
+ geany_project_regenerate_file_list(g_current_project);
+ }
+ sidebar_refresh();
+ }
+
+ gtk_widget_destroy(e->dialog);
+ g_free(e);
+ g_free(project_dir);
+}
+
+void
+on_delete_project(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data)
+{
+ gchar *path;
+ if (!g_current_project)
+ return;
+
+ if (dialogs_show_question("Do you really wish to delete current project:\n%s?",
+ g_current_project->name))
+ {
+ path = utils_get_locale_from_utf8(g_current_project->path);
+ xproject_close(FALSE);
+ g_unlink(path);
+ g_free(path);
+ }
+}
+
+void
+on_add_file(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data)
+{
+ GeanyDocument *doc;
+
+ doc = document_get_current();
+ g_return_if_fail(doc && doc->file_name != NULL && g_path_is_absolute(doc->file_name));
+
+ if (!g_current_project)
+ return;
+
+ xproject_add_file(doc->file_name);
+}
+
+void
+on_find_in_project(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data)
+{
+ gchar *dir;
+ if (!g_current_project)
+ return;
+
+ dir = g_path_get_dirname(g_current_project->path);
+ search_show_find_in_files_dialog(dir);
+ g_free(dir);
+}
+
+static void
+update_menu_items()
+{
+ gboolean cur_file_exists;
+ gboolean badd_file;
+ GeanyDocument *doc;
+
+ doc = document_get_current();
+ g_return_if_fail(doc != NULL && doc->file_name != NULL);
+
+ cur_file_exists = doc && doc->file_name != NULL && g_path_is_absolute(doc->file_name);
+
+ badd_file = (g_current_project ? TRUE : FALSE) &&
+ !g_current_project->regenerate &&
+ cur_file_exists && !g_hash_table_lookup(g_current_project->tags, doc->file_name);
+
+ gtk_widget_set_sensitive(menu_items.new_project, TRUE);
+ gtk_widget_set_sensitive(menu_items.delete_project, g_current_project ? TRUE : FALSE);
+
+ gtk_widget_set_sensitive(menu_items.add_file, badd_file);
+
+ gtk_widget_set_sensitive(menu_items.preferences, g_current_project ? TRUE : FALSE);
+
+ gtk_widget_set_sensitive(menu_items.find_in_files, g_current_project ? TRUE : FALSE);
+}
+
+void
+tools_menu_init()
+{
+ GtkWidget *item, *image;
+
+ GtkWidget *menu_prj = NULL;
+ GtkWidget *menu_prj_menu = NULL;
+ GtkTooltips *tooltips = NULL;
+
+ tooltips = gtk_tooltips_new();
+
+ menu_prj = gtk_image_menu_item_new_with_mnemonic(_("_Project"));
+ gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), menu_prj);
+
+ g_signal_connect((gpointer) menu_prj, "activate", G_CALLBACK(update_menu_items), NULL);
+
+ menu_prj_menu = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_prj), menu_prj_menu);
+
+ //
+
+
+ image = gtk_image_new_from_stock(GTK_STOCK_NEW, GTK_ICON_SIZE_MENU);
+ item = gtk_image_menu_item_new_with_mnemonic(_("New Project"));
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
+ gtk_widget_show(item);
+ gtk_container_add(GTK_CONTAINER(menu_prj_menu), item);
+ g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_new_project), NULL);
+ menu_items.new_project = item;
+
+ image = gtk_image_new_from_stock(GTK_STOCK_DELETE, GTK_ICON_SIZE_MENU);
+ gtk_widget_show(image);
+ item = gtk_image_menu_item_new_with_mnemonic(_("Delete Project"));
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
+ gtk_widget_show(item);
+ gtk_container_add(GTK_CONTAINER(menu_prj_menu), item);
+ g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_delete_project), NULL);
+ menu_items.delete_project = item;
+
+ gtk_container_add(GTK_CONTAINER(menu_prj_menu), gtk_separator_menu_item_new());
+
+ image = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
+ gtk_widget_show(image);
+ item = gtk_image_menu_item_new_with_mnemonic(_("Add File"));
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
+ gtk_widget_show(item);
+ gtk_container_add(GTK_CONTAINER(menu_prj_menu), item);
+ g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_add_file), NULL);
+ menu_items.add_file = item;
+
+ gtk_container_add(GTK_CONTAINER(menu_prj_menu), gtk_separator_menu_item_new());
+
+ image = gtk_image_new_from_stock(GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU);
+ gtk_widget_show(image);
+ item = gtk_image_menu_item_new_with_mnemonic(_("Preferences"));
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
+ gtk_widget_show(item);
+ gtk_container_add(GTK_CONTAINER(menu_prj_menu), item);
+ g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_preferences), NULL);
+ menu_items.preferences = item;
+
+ gtk_container_add(GTK_CONTAINER(menu_prj_menu), gtk_separator_menu_item_new());
+
+ image = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
+ gtk_widget_show(image);
+ item = gtk_image_menu_item_new_with_mnemonic(_("Find in Project"));
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
+ gtk_widget_show(item);
+ gtk_container_add(GTK_CONTAINER(menu_prj_menu), item);
+ g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_find_in_project), NULL);
+ menu_items.find_in_files = item;
+
+ gtk_widget_show_all(menu_prj);
+
+ plugin_fields->menu_item = menu_prj;
+ plugin_fields->flags = PLUGIN_IS_DOCUMENT_SENSITIVE;
+}
+
+void
+tools_menu_uninit()
+{
+ gtk_widget_destroy(plugin_fields->menu_item);
+}
Added: trunk/geany-plugins/geanyprj/src/project.c
===================================================================
--- trunk/geany-plugins/geanyprj/src/project.c (rev 0)
+++ trunk/geany-plugins/geanyprj/src/project.c 2009-09-08 11:28:33 UTC (rev 922)
@@ -0,0 +1,458 @@
+/*
+ * geanyprj - Alternative project support for geany light IDE.
+ *
+ * Copyright 2007 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+ * Copyright 2007 Enrico Tröger <enrico.troeger(a)uvena.de>
+ * Copyright 2007 Nick Treleaven <nick.treleaven(a)btinternet.com>
+ * Copyright 2007,2008 Yura Siamashka <yurand2(a)gmail.com>
+ *
+ * This program 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <string.h>
+#include <sys/time.h>
+
+#include "geany.h"
+#include "support.h"
+#include "prefs.h"
+#include "plugindata.h"
+#include "document.h"
+#include "filetypes.h"
+#include "utils.h"
+#include "geanyfunctions.h"
+
+#include "project.h"
+
+#include "geanyprj.h"
+
+extern GeanyData *geany_data;
+extern GeanyFunctions *geany_functions;
+
+const gchar *project_type_string[NEW_PROJECT_TYPE_SIZE] = {
+ "All",
+ "C/C++",
+ "C",
+ "Python",
+ "None"
+};
+
+static gboolean
+project_filter_c_cpp(const gchar * file)
+{
+ if (filetypes_detect_from_file(file)->id == GEANY_FILETYPES_C ||
+ filetypes_detect_from_file(file)->id == GEANY_FILETYPES_CPP)
+ return TRUE;
+ return FALSE;
+}
+
+static gboolean
+project_filter_c(const gchar * file)
+{
+ if (filetypes_detect_from_file(file)->id == GEANY_FILETYPES_C)
+ return TRUE;
+ return FALSE;
+}
+
+static gboolean
+project_filter_python(const gchar * file)
+{
+ if (filetypes_detect_from_file(file)->id == GEANY_FILETYPES_PYTHON)
+ return TRUE;
+ return FALSE;
+}
+
+static gboolean
+project_filter_all(const gchar * file)
+{
+ if (filetypes_detect_from_file(file)->id != GEANY_FILETYPES_NONE)
+ return TRUE;
+ return FALSE;
+}
+
+static gboolean
+project_filter_none(G_GNUC_UNUSED const gchar * file)
+{
+ return FALSE;
+}
+
+
+void *project_type_filter[NEW_PROJECT_TYPE_SIZE] = {
+ project_filter_all,
+ project_filter_c_cpp,
+ project_filter_c,
+ project_filter_python,
+ project_filter_none
+};
+
+
+static void
+free_tag_object(gpointer obj)
+{
+ tm_workspace_remove_object((TMWorkObject *) obj, TRUE, FALSE);
+}
+
+struct GeanyPrj *
+geany_project_new()
+{
+ struct GeanyPrj *ret;
+
+ ret = (struct GeanyPrj *) g_new0(struct GeanyPrj, 1);
+ ret->tags = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, free_tag_object);
+
+ return ret;
+}
+
+struct GeanyPrj *
+geany_project_load(const gchar * path)
+{
+ struct GeanyPrj *ret;
+ TMWorkObject *tm_obj = NULL;
+ GKeyFile *config;
+ gint i = 0;
+ gchar *file;
+ gchar *filename, *locale_filename;
+ gchar *key;
+ gchar *tmp;
+
+ debug("%s path=%s\n", __FUNCTION__, path);
+
+ if (!path)
+ return NULL;
+
+ config = g_key_file_new();
+ if (!g_key_file_load_from_file(config, path, G_KEY_FILE_NONE, NULL))
+ {
+ g_key_file_free(config);
+ return NULL;
+ }
+
+
+ ret = geany_project_new();
+ geany_project_set_path(ret, path);
+
+ tmp = utils_get_setting_string(config, "project", "name", GEANY_STRING_UNTITLED);
+ geany_project_set_name(ret, tmp);
+ g_free(tmp);
+
+ tmp = utils_get_setting_string(config, "project", "description", "");
+ geany_project_set_description(ret, tmp);
+ g_free(tmp);
+
+ tmp = utils_get_setting_string(config, "project", "base_path", "");
+ geany_project_set_base_path(ret, tmp);
+ g_free(tmp);
+
+ tmp = utils_get_setting_string(config, "project", "run_cmd", "");
+ geany_project_set_run_cmd(ret, tmp);
+ g_free(tmp);
+
+ geany_project_set_type_string(ret,
+ utils_get_setting_string(config, "project", "type",
+ project_type_string[0]));
+ geany_project_set_regenerate(ret,
+ g_key_file_get_boolean(config, "project", "regenerate", NULL));
+
+ if (ret->regenerate)
+ {
+ geany_project_regenerate_file_list(ret);
+ }
+ else
+ {
+ // Create tag files
+ key = g_strdup_printf("file%d", i);
+ while ((file = g_key_file_get_string(config, "files", key, NULL)))
+ {
+ filename = get_full_path(path, file);
+
+ locale_filename = utils_get_locale_from_utf8(filename);
+ tm_obj = tm_source_file_new(locale_filename, FALSE,
+ filetypes_detect_from_file(filename)->name);
+ g_free(locale_filename);
+ if (tm_obj)
+ {
+ g_hash_table_insert(ret->tags, filename, tm_obj);
+ tm_source_file_update(tm_obj, TRUE, FALSE, TRUE);
+ }
+ else
+ g_free(filename);
+ i++;
+ g_free(key);
+ g_free(file);
+ key = g_strdup_printf("file%d", i);
+ }
+ g_free(key);
+ }
+ g_key_file_free(config);
+ return ret;
+}
+
+#if !GLIB_CHECK_VERSION(2, 12, 0)
+static gboolean
+get_true(gpointer key, gpointer value, gpointer user_data)
+{
+ return TRUE;
+}
+
+static void
+g_hash_table_remove_all(GHashTable * hash_table)
+{
+ g_hash_table_foreach_remove(hash_table, get_true, NULL);
+}
+#endif
+
+void
+geany_project_regenerate_file_list(struct GeanyPrj *prj)
+{
+ GSList *lst;
+
+ debug("%s path=%s\n", __FUNCTION__, prj->base_path);
+ g_hash_table_remove_all(prj->tags);
+
+ lst = get_file_list(prj->base_path, NULL, project_type_filter[prj->type], NULL);
+ geany_project_set_tags_from_list(prj, lst);
+
+ g_slist_foreach(lst, (GFunc) g_free, NULL);
+ g_slist_free(lst);
+}
+
+void
+geany_project_set_path(struct GeanyPrj *prj, const gchar * path)
+{
+ gchar *norm_path = normpath(path);
+ if (prj->path)
+ {
+ if (strcmp(prj->path, norm_path) == 0)
+ {
+ g_free(norm_path);
+ return;
+ }
+ }
+ prj->path = norm_path;
+}
+
+void
+geany_project_set_name(struct GeanyPrj *prj, const gchar * name)
+{
+ if (prj->name)
+ g_free(prj->name);
+ prj->name = g_strdup(name);
+}
+
+void
+geany_project_set_type_int(struct GeanyPrj *prj, gint val)
+{
+ prj->type = val;
+}
+
+void
+geany_project_set_type_string(struct GeanyPrj *prj, const gchar * val)
+{
+ guint i;
+
+ for (i = 0; i < sizeof(project_type_string) / sizeof(project_type_string[0]); i++)
+ {
+ if (strcmp(val, project_type_string[i]) == 0)
+ return geany_project_set_type_int(prj, i);
+ }
+}
+
+void
+geany_project_set_regenerate(struct GeanyPrj *prj, gboolean val)
+{
+ prj->regenerate = val;
+}
+
+void
+geany_project_set_description(struct GeanyPrj *prj, const gchar * description)
+{
+ if (prj->description)
+ g_free(prj->description);
+ prj->description = g_strdup(description);
+}
+
+void
+geany_project_set_base_path(struct GeanyPrj *prj, const gchar * base_path)
+{
+ if (prj->base_path)
+ g_free(prj->base_path);
+
+ if (g_path_is_absolute(base_path))
+ {
+ prj->base_path = g_strdup(base_path);
+ }
+ else
+ {
+ prj->base_path = get_full_path(prj->path, base_path);
+ }
+}
+
+void
+geany_project_set_run_cmd(struct GeanyPrj *prj, const gchar * run_cmd)
+{
+ if (prj->run_cmd)
+ g_free(prj->run_cmd);
+ prj->run_cmd = g_strdup(run_cmd);
+}
+
+
+// list in utf8
+void
+geany_project_set_tags_from_list(struct GeanyPrj *prj, GSList * files)
+{
+ GSList *tmp;
+ gchar *locale_filename;
+ TMWorkObject *tm_obj = NULL;
+
+ if (prj->tags)
+ g_hash_table_destroy(prj->tags);
+ prj->tags = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, free_tag_object);
+
+ for (tmp = files; tmp != NULL; tmp = g_slist_next(tmp))
+ {
+ locale_filename = utils_get_locale_from_utf8(tmp->data);
+ tm_obj = tm_source_file_new(locale_filename, FALSE,
+ filetypes_detect_from_file(tmp->data)->name);
+ g_free(locale_filename);
+ if (tm_obj)
+ {
+ g_hash_table_insert(prj->tags, g_strdup(tmp->data), tm_obj);
+ tm_source_file_update(tm_obj, TRUE, FALSE, TRUE);
+ }
+ }
+}
+
+
+void
+geany_project_free(struct GeanyPrj *prj)
+{
+ debug("%s prj=%p\n", __FUNCTION__, prj);
+ g_return_if_fail(prj);
+
+ if (prj->path)
+ g_free(prj->path);
+ if (prj->name)
+ g_free(prj->name);
+ if (prj->description)
+ g_free(prj->description);
+ if (prj->base_path)
+ g_free(prj->base_path);
+ if (prj->run_cmd)
+ g_free(prj->run_cmd);
+ if (prj->tags)
+ g_hash_table_destroy(prj->tags);
+
+ g_free(prj);
+}
+
+gboolean
+geany_project_add_file(struct GeanyPrj *prj, const gchar * path)
+{
+ gchar *filename;
+ TMWorkObject *tm_obj = NULL;
+
+ GKeyFile *config;
+
+ config = g_key_file_new();
+ if (!g_key_file_load_from_file(config, prj->path, G_KEY_FILE_NONE, NULL))
+ {
+ g_key_file_free(config);
+ return FALSE;
+ }
+
+ if (g_hash_table_lookup(prj->tags, path))
+ {
+ g_key_file_free(config);
+ return TRUE;
+ }
+
+ filename = utils_get_locale_from_utf8(path);
+ tm_obj = tm_source_file_new(filename, FALSE, filetypes_detect_from_file(path)->name);
+ g_free(filename);
+ if (tm_obj)
+ {
+ g_hash_table_insert(prj->tags, g_strdup(path), tm_obj);
+ tm_source_file_update(tm_obj, TRUE, FALSE, TRUE);
+ }
+ geany_project_save(prj);
+ return TRUE;
+}
+
+struct CFGData
+{
+ struct GeanyPrj *prj;
+ GKeyFile *config;
+ int i;
+};
+
+static void
+geany_project_save_files(gpointer key, G_GNUC_UNUSED gpointer value, gpointer user_data)
+{
+ gchar *fkey;
+ gchar *filename;
+ struct CFGData *data = (struct CFGData *) user_data;
+
+ filename = get_relative_path(data->prj->path, (const gchar *) key);
+ if (filename)
+ {
+ fkey = g_strdup_printf("file%d", data->i);
+ g_key_file_set_string(data->config, "files", fkey, filename);
+ data->i++;
+ g_free(fkey);
+ g_free(filename);
+ }
+}
+
+gboolean
+geany_project_remove_file(struct GeanyPrj *prj, const gchar * path)
+{
+ if (!g_hash_table_remove(prj->tags, path))
+ {
+ return FALSE;
+ }
+
+ geany_project_save(prj);
+ return TRUE;
+}
+
+void
+geany_project_save(struct GeanyPrj *prj)
+{
+ GKeyFile *config;
+ struct CFGData data;
+ gchar *base_path;
+
+ base_path = get_relative_path(prj->path, prj->base_path);
+
+ config = g_key_file_new();
+ g_key_file_load_from_file(config, prj->path, G_KEY_FILE_NONE, NULL);
+
+ g_key_file_set_string(config, "project", "name", prj->name);
+ g_key_file_set_string(config, "project", "description", prj->description);
+ g_key_file_set_string(config, "project", "base_path", base_path);
+ g_key_file_set_string(config, "project", "run_cmd", prj->run_cmd);
+ g_key_file_set_boolean(config, "project", "regenerate", prj->regenerate);
+ g_key_file_set_string(config, "project", "type", project_type_string[prj->type]);
+
+ data.prj = prj;
+ data.config = config;
+ data.i = 0;
+
+ g_key_file_remove_group(config, "files", NULL);
+ if (!prj->regenerate)
+ {
+ g_hash_table_foreach(prj->tags, geany_project_save_files, &data);
+ }
+ save_config(config, prj->path);
+ g_free(base_path);
+}
Added: trunk/geany-plugins/geanyprj/src/sidebar.c
===================================================================
--- trunk/geany-plugins/geanyprj/src/sidebar.c (rev 0)
+++ trunk/geany-plugins/geanyprj/src/sidebar.c 2009-09-08 11:28:33 UTC (rev 922)
@@ -0,0 +1,469 @@
+/*
+ * geanyprj - Alternative project support for geany light IDE.
+ *
+ * Copyright 2008 Yura Siamashka <yurand2(a)gmail.com>
+ *
+ * This program 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <sys/time.h>
+#include <gdk/gdkkeysyms.h>
+#include <string.h>
+
+#include "geany.h"
+#include "support.h"
+#include "prefs.h"
+#include "plugindata.h"
+#include "document.h"
+#include "filetypes.h"
+#include "keybindings.h"
+#include "utils.h"
+#include "ui_utils.h"
+#include "geanyfunctions.h"
+
+#include "project.h"
+
+#include "geanyprj.h"
+
+extern GeanyData *geany_data;
+extern GeanyFunctions *geany_functions;
+
+static GtkWidget *file_view_vbox;
+static GtkWidget *file_view;
+static GtkListStore *file_store;
+
+enum
+{
+ FILEVIEW_COLUMN_NAME = 0,
+ FILEVIEW_N_COLUMNS,
+};
+
+static struct
+{
+ GtkWidget *new_project;
+ GtkWidget *delete_project;
+
+ GtkWidget *add_file;
+ GtkWidget *remove_files;
+
+ GtkWidget *preferences;
+
+ GtkWidget *find_in_files;
+} popup_items;
+
+
+/* Returns: the full filename in locale encoding. */
+static gchar *
+get_tree_path_filename(GtkTreePath * treepath)
+{
+ GtkTreeModel *model = GTK_TREE_MODEL(file_store);
+ GtkTreeIter iter;
+ gchar *name;
+
+ gtk_tree_model_get_iter(model, &iter, treepath);
+ gtk_tree_model_get(model, &iter, FILEVIEW_COLUMN_NAME, &name, -1);
+ setptr(name, utils_get_locale_from_utf8(name));
+ setptr(name, get_full_path(g_current_project->path, name));
+ return name;
+}
+
+/* We use documents->open_files() as it's more efficient. */
+static void
+open_selected_files(GList * list)
+{
+ GSList *files = NULL;
+ GList *item;
+
+ for (item = list; item != NULL; item = g_list_next(item))
+ {
+ GtkTreePath *treepath = item->data;
+ gchar *fname = get_tree_path_filename(treepath);
+ files = g_slist_append(files, fname);
+ }
+ document_open_files(files, FALSE, NULL, NULL);
+ g_slist_foreach(files, (GFunc) g_free, NULL); // free filenames
+ g_slist_free(files);
+}
+
+static void
+on_open_clicked(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data)
+{
+ GtkTreeSelection *treesel;
+ GtkTreeModel *model;
+ GList *list;
+
+ treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(file_view));
+
+ list = gtk_tree_selection_get_selected_rows(treesel, &model);
+ open_selected_files(list);
+ g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL);
+ g_list_free(list);
+}
+
+static gboolean
+on_button_press(G_GNUC_UNUSED GtkWidget * widget, GdkEventButton * event,
+ G_GNUC_UNUSED gpointer user_data)
+{
+ if (event->button == 1 && event->type == GDK_2BUTTON_PRESS)
+ on_open_clicked(NULL, NULL);
+ return FALSE;
+}
+
+static GtkWidget *
+make_toolbar()
+{
+ GtkWidget *toolbar;
+
+ toolbar = gtk_toolbar_new();
+ gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_MENU);
+ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
+
+ return toolbar;
+}
+
+static void
+remove_selected_files(GList * list)
+{
+ GList *item;
+ for (item = list; item != NULL; item = g_list_next(item))
+ {
+ GtkTreePath *treepath = item->data;
+ gchar *fname = get_tree_path_filename(treepath);
+ xproject_remove_file(fname);
+ g_free(fname);
+ }
+}
+
+static void
+on_remove_files(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data)
+{
+ GtkTreeSelection *treesel;
+ GtkTreeModel *model;
+ GList *list;
+
+ treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(file_view));
+
+ list = gtk_tree_selection_get_selected_rows(treesel, &model);
+ remove_selected_files(list);
+ g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL);
+ g_list_free(list);
+}
+
+static gboolean
+on_key_press(G_GNUC_UNUSED GtkWidget * widget, GdkEventKey * event, G_GNUC_UNUSED gpointer data)
+{
+ if (event->keyval == GDK_Return
+ || event->keyval == GDK_ISO_Enter
+ || event->keyval == GDK_KP_Enter || event->keyval == GDK_space)
+ on_open_clicked(NULL, NULL);
+ return FALSE;
+}
+
+static GtkWidget *
+create_popup_menu()
+{
+ GtkWidget *item, *menu, *image;
+
+ menu = gtk_menu_new();
+
+ image = gtk_image_new_from_stock(GTK_STOCK_NEW, GTK_ICON_SIZE_MENU);
+ gtk_widget_show(image);
+ item = gtk_image_menu_item_new_with_mnemonic(_("New Project"));
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
+ gtk_widget_show(item);
+ gtk_container_add(GTK_CONTAINER(menu), item);
+ g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_new_project), NULL);
+ popup_items.new_project = item;
+
+ image = gtk_image_new_from_stock(GTK_STOCK_DELETE, GTK_ICON_SIZE_MENU);
+ gtk_widget_show(image);
+ item = gtk_image_menu_item_new_with_mnemonic(_("Delete Project"));
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
+ gtk_widget_show(item);
+ gtk_container_add(GTK_CONTAINER(menu), item);
+ g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_delete_project), NULL);
+ popup_items.delete_project = item;
+
+ item = gtk_separator_menu_item_new();
+ gtk_widget_show(item);
+ gtk_container_add(GTK_CONTAINER(menu), item);
+
+ image = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
+ gtk_widget_show(image);
+ item = gtk_image_menu_item_new_with_mnemonic(_("Add File"));
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
+ gtk_widget_show(item);
+ gtk_container_add(GTK_CONTAINER(menu), item);
+ g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_add_file), NULL);
+ popup_items.add_file = item;
+
+ image = gtk_image_new_from_stock(GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU);
+ gtk_widget_show(image);
+ item = gtk_image_menu_item_new_with_mnemonic(_("Remove File"));
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
+ gtk_widget_show(item);
+ gtk_container_add(GTK_CONTAINER(menu), item);
+ g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_remove_files), NULL);
+ popup_items.remove_files = item;
+
+ item = gtk_separator_menu_item_new();
+ gtk_widget_show(item);
+ gtk_container_add(GTK_CONTAINER(menu), item);
+
+ image = gtk_image_new_from_stock(GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU);
+ gtk_widget_show(image);
+ item = gtk_image_menu_item_new_with_mnemonic(_("Preferences"));
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
+ gtk_widget_show(item);
+ gtk_container_add(GTK_CONTAINER(menu), item);
+ g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_preferences), NULL);
+ popup_items.preferences = item;
+
+ item = gtk_separator_menu_item_new();
+ gtk_widget_show(item);
+ gtk_container_add(GTK_CONTAINER(menu), item);
+
+ image = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
+ gtk_widget_show(image);
+ item = gtk_image_menu_item_new_with_mnemonic(_("Find in Project"));
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
+ gtk_widget_show(item);
+ gtk_container_add(GTK_CONTAINER(menu), item);
+ g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_find_in_project), NULL);
+ popup_items.find_in_files = item;
+
+ item = gtk_separator_menu_item_new();
+ gtk_widget_show(item);
+ gtk_container_add(GTK_CONTAINER(menu), item);
+
+ item = gtk_image_menu_item_new_with_mnemonic(_("H_ide Sidebar"));
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
+ gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU));
+ gtk_widget_show(item);
+ gtk_container_add(GTK_CONTAINER(menu), item);
+ g_signal_connect_swapped((gpointer) item, "activate",
+ G_CALLBACK(keybindings_send_command),
+ GINT_TO_POINTER(GEANY_KEYS_VIEW_SIDEBAR));
+
+ return menu;
+}
+
+static void
+update_popup_menu(G_GNUC_UNUSED GtkWidget * popup_menu)
+{
+ gboolean cur_file_exists;
+ gboolean badd_file;
+ GeanyDocument *doc;
+
+ doc = document_get_current();
+
+ cur_file_exists = doc && doc->file_name != NULL && g_path_is_absolute(doc->file_name);
+
+ badd_file = (g_current_project ? TRUE : FALSE) &&
+ !g_current_project->regenerate &&
+ cur_file_exists && !g_hash_table_lookup(g_current_project->tags, doc->file_name);
+
+ GtkTreeSelection *treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(file_view));
+ gboolean bremove_file = (g_current_project ? TRUE : FALSE) &&
+ !g_current_project->regenerate &&
+ (gtk_tree_selection_count_selected_rows(treesel) > 0);
+
+ gtk_widget_set_sensitive(popup_items.new_project, TRUE);
+ gtk_widget_set_sensitive(popup_items.delete_project, g_current_project ? TRUE : FALSE);
+
+ gtk_widget_set_sensitive(popup_items.add_file, badd_file);
+ gtk_widget_set_sensitive(popup_items.remove_files, bremove_file);
+
+ gtk_widget_set_sensitive(popup_items.preferences, g_current_project ? TRUE : FALSE);
+
+ gtk_widget_set_sensitive(popup_items.find_in_files, g_current_project ? TRUE : FALSE);
+}
+
+// delay updating popup menu until the selection has been set
+static gboolean
+on_button_release(G_GNUC_UNUSED GtkWidget * widget, GdkEventButton * event,
+ G_GNUC_UNUSED gpointer user_data)
+{
+ if (event->button == 3)
+ {
+ static GtkWidget *popup_menu = NULL;
+
+ if (popup_menu == NULL)
+ popup_menu = create_popup_menu();
+
+ update_popup_menu(popup_menu);
+
+ gtk_menu_popup(GTK_MENU(popup_menu), NULL, NULL, NULL, NULL,
+ event->button, event->time);
+ }
+ return FALSE;
+}
+
+static void
+prepare_file_view()
+{
+ GtkCellRenderer *text_renderer;
+ GtkTreeViewColumn *column;
+ GtkTreeSelection *select;
+ PangoFontDescription *pfd;
+
+ file_store = gtk_list_store_new(FILEVIEW_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING);
+
+ gtk_tree_view_set_model(GTK_TREE_VIEW(file_view), GTK_TREE_MODEL(file_store));
+
+ text_renderer = gtk_cell_renderer_text_new();
+ column = gtk_tree_view_column_new();
+ gtk_tree_view_column_pack_start(column, text_renderer, TRUE);
+ gtk_tree_view_column_set_attributes(column, text_renderer, "text", FILEVIEW_COLUMN_NAME,
+ NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(file_view), column);
+ gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(file_view), FALSE);
+
+ gtk_tree_view_set_enable_search(GTK_TREE_VIEW(file_view), TRUE);
+ gtk_tree_view_set_search_column(GTK_TREE_VIEW(file_view), FILEVIEW_COLUMN_NAME);
+
+ pfd = pango_font_description_from_string(geany_data->interface_prefs->tagbar_font);
+ gtk_widget_modify_font(file_view, pfd);
+ pango_font_description_free(pfd);
+
+ // selection handling
+ select = gtk_tree_view_get_selection(GTK_TREE_VIEW(file_view));
+ gtk_tree_selection_set_mode(select, GTK_SELECTION_SINGLE);
+
+ g_signal_connect(G_OBJECT(file_view), "button-release-event",
+ G_CALLBACK(on_button_release), NULL);
+ g_signal_connect(G_OBJECT(file_view), "button-press-event",
+ G_CALLBACK(on_button_press), NULL);
+
+ g_signal_connect(G_OBJECT(file_view), "key-press-event", G_CALLBACK(on_key_press), NULL);
+}
+
+void
+sidebar_clear()
+{
+ gtk_list_store_clear(file_store);
+}
+
+gint
+mycmp(const gchar * a, const gchar * b)
+{
+ const gchar *p1 = a;
+ const gchar *p2 = b;
+
+ gint cnt1 = 0;
+ gint cnt2 = 0;
+
+ while (*p1)
+ {
+ if (*p1 == G_DIR_SEPARATOR_S[0])
+ cnt1++;
+ p1++;
+ }
+
+ while (*p2)
+ {
+ if (*p2 == G_DIR_SEPARATOR_S[0])
+ cnt2++;
+ p2++;
+ }
+
+ if (cnt1 != cnt2)
+ return cnt2 - cnt1;
+
+ p1 = a;
+ p2 = b;
+
+ while (*p1 && *p2)
+ {
+ if (*p1 != *p2)
+ {
+ if (*p1 == G_DIR_SEPARATOR_S[0])
+ return -1;
+ else if (*p2 == G_DIR_SEPARATOR_S[0])
+ return 1;
+ return *p1 - *p2;
+ }
+ p1++;
+ p2++;
+ }
+ if (*p1 == 0 && *p2 == 0)
+ return 0;
+ else if (*p1)
+ return 1;
+ return -1;
+}
+
+static void
+add_item(gpointer name, G_GNUC_UNUSED gpointer value, gpointer user_data)
+{
+ gchar *item;
+ GSList **lst = (GSList **) user_data;
+
+ item = get_relative_path(g_current_project->path, name);
+ *lst = g_slist_prepend(*lst, item);
+}
+
+// recreate the tree model from current_dir.
+void
+sidebar_refresh()
+{
+ GtkTreeIter iter;
+ GSList *lst = NULL;
+ GSList *tmp;
+
+ sidebar_clear();
+
+ if (!g_current_project)
+ return;
+
+ g_hash_table_foreach(g_current_project->tags, add_item, &lst);
+ lst = g_slist_sort(lst, (GCompareFunc) strcmp);
+ for (tmp = lst; tmp != NULL; tmp = g_slist_next(tmp))
+ {
+ gtk_list_store_append(file_store, &iter);
+ gtk_list_store_set(file_store, &iter, FILEVIEW_COLUMN_NAME, tmp->data, -1);
+ }
+ g_slist_foreach(lst, (GFunc) g_free, NULL);
+ g_slist_free(lst);
+}
+
+void
+create_sidebar()
+{
+ GtkWidget *scrollwin, *toolbar;
+
+ file_view_vbox = gtk_vbox_new(FALSE, 0);
+ toolbar = make_toolbar();
+ gtk_box_pack_start(GTK_BOX(file_view_vbox), toolbar, FALSE, FALSE, 0);
+
+ file_view = gtk_tree_view_new();
+ prepare_file_view();
+
+ scrollwin = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_container_add(GTK_CONTAINER(scrollwin), file_view);
+ gtk_container_add(GTK_CONTAINER(file_view_vbox), scrollwin);
+
+ gtk_widget_show_all(file_view_vbox);
+ gtk_notebook_append_page(GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook),
+ file_view_vbox, gtk_label_new(_("Project")));
+}
+
+void
+destroy_sidebar()
+{
+ gtk_widget_destroy(file_view_vbox);
+}
Added: trunk/geany-plugins/geanyprj/src/utils.c
===================================================================
--- trunk/geany-plugins/geanyprj/src/utils.c (rev 0)
+++ trunk/geany-plugins/geanyprj/src/utils.c 2009-09-08 11:28:33 UTC (rev 922)
@@ -0,0 +1,276 @@
+/*
+ * geanyprj - Alternative project support for geany light IDE.
+ *
+ * Copyright 2008 Yura Siamashka <yurand2(a)gmail.com>
+ *
+ * This program 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <string.h>
+#include <glib.h>
+
+#include "geany.h"
+#include "utils.h"
+
+gchar *
+find_file_path(const gchar * dir, const gchar * filename)
+{
+ gboolean ret = FALSE;
+ gchar *base;
+ gchar *gitdir = NULL;
+ gchar *base_prev = g_strdup(":");
+
+ base = g_strdup(dir);
+
+ while (strcmp(base, base_prev) != 0)
+ {
+ gitdir = g_build_filename(base, filename, NULL);
+ ret = g_file_test(gitdir, G_FILE_TEST_IS_REGULAR);
+ if (ret)
+ {
+ g_free(base_prev);
+ g_free(base);
+ return gitdir;
+ }
+ g_free(gitdir);
+ g_free(base_prev);
+ base_prev = base;
+ base = g_path_get_dirname(base);
+ }
+
+ g_free(base_prev);
+ g_free(base);
+ return NULL;
+}
+
+/* Normalize a pathname. This collapses redundant separators and up-level references so that A//B, A/./B
+ * and A/foo/../B all become A/B. It does not normalize the case. On Windows, it converts forward
+ * slashes to backward slashes. It should be understood that this may change the meaning of the
+ * path if it contains symbolic links!
+ */
+gchar *
+normpath(const gchar * filename)
+{
+ gchar **v;
+ gchar **p;
+ gchar **out;
+ gchar **pout;
+ gchar *ret;
+
+ if (!filename || strlen(filename) == 0)
+ return g_strdup(".");
+ v = g_strsplit_set(filename, "/\\", -1);
+ if (!g_strv_length(v))
+ return g_strdup(".");
+
+ out = g_malloc0(sizeof(gchar *) * (g_strv_length(v) + 2));
+ pout = out;
+
+ if (filename[0] == '.' && strcmp(v[0], ".") == 0)
+ {
+ *pout = strdup(".");
+ pout++;
+ }
+ else if (filename[0] == '/')
+ {
+ *pout = strdup("/");
+ pout++;
+ }
+
+ for (p = v; *p; p++)
+ {
+ if (strcmp(*p, ".") == 0 || strcmp(*p, "") == 0)
+ {
+ continue;
+ }
+ else if (strcmp(*p, "..") == 0)
+ {
+ if (pout != out)
+ {
+ pout--;
+ if (strcmp(*pout, "..") != 0)
+ {
+ g_free(*pout);
+ *pout = NULL;
+ continue;
+ }
+ pout++;
+ }
+ }
+ *pout++ = g_strdup(*p);
+ }
+
+ ret = g_build_filenamev(out);
+
+ g_strfreev(out);
+ g_strfreev(v);
+ return ret;
+}
+
+gchar *
+get_full_path(const gchar * location, const gchar * path)
+{
+ gchar *dir;
+
+ dir = g_path_get_dirname(location);
+ setptr(dir, g_build_filename(dir, path, NULL));
+ setptr(dir, normpath(dir));
+ return dir;
+}
+
+gchar *
+get_relative_path(const gchar * location, const gchar * path)
+{
+ gchar *dir;
+ gint plen;
+ gint dlen;
+
+ if (!g_path_is_absolute(path))
+ {
+ return g_strdup(path);
+ }
+
+ dir = g_path_get_dirname(location);
+ setptr(dir, normpath(dir));
+
+ plen = strlen(path);
+ dlen = strlen(dir);
+
+ if (strstr(path, dir) == path)
+ {
+ if (plen > dlen)
+ {
+ setptr(dir, g_strdup(path + strlen(dir) + 1));
+ return dir;
+ }
+ else if (plen == dlen)
+ {
+ return g_strdup("./");
+ }
+ }
+ g_free(dir);
+ return NULL;
+}
+
+void
+save_config(GKeyFile * config, const gchar * path)
+{
+ gchar *data = g_key_file_to_data(config, NULL, NULL);
+ utils_write_file(path, data);
+ g_free(data);
+}
+
+gint
+config_length(GKeyFile * config, const gchar * section, const gchar * name)
+{
+ gchar *key;
+ gint i = 0;
+
+ key = g_strdup_printf("%s%d", name, i);
+ while (g_key_file_has_key(config, section, key, NULL))
+ {
+ i++;
+ g_free(key);
+ key = g_strdup_printf("%s%d", name, i);
+ }
+ g_free(key);
+ return i;
+}
+
+
+/* Gets a list of files from the specified directory.
+ * Locale encoding is expected for path and used for the file list.
+ * The list and the data in the list should be freed after use.
+ * Returns: The list or NULL if no files found.
+ * length will point to the number of non-NULL data items in the list, unless NULL.
+ * error is the location for storing a possible error, or NULL. */
+GSList *
+get_file_list(const gchar * path, guint * length, gboolean(*func) (const gchar *), GError ** error)
+{
+ GSList *list = NULL;
+ guint len = 0;
+ GDir *dir;
+ gchar *filename;
+ gchar *abs_path;
+
+ if (error)
+ *error = NULL;
+ if (length)
+ *length = 0;
+ g_return_val_if_fail(path != NULL, NULL);
+
+ if (g_path_is_absolute(path))
+ {
+ abs_path = g_strdup(path);
+ }
+ else
+ {
+ abs_path = g_get_current_dir();
+ setptr(abs_path, g_build_filename(abs_path, path, NULL));
+ }
+ if (!g_file_test(abs_path, G_FILE_TEST_IS_DIR))
+ {
+ g_free(abs_path);
+ return NULL;
+ }
+
+ dir = g_dir_open(abs_path, 0, error);
+ if (dir == NULL)
+ {
+ g_free(abs_path);
+ return NULL;
+ }
+
+ while (1)
+ {
+ const gchar *name = g_dir_read_name(dir);
+ if (name == NULL)
+ break;
+
+ if (name[0] == '.')
+ continue;
+
+ filename = g_build_filename(abs_path, name, NULL);
+
+ if (g_file_test(filename, G_FILE_TEST_IS_DIR))
+ {
+ guint l;
+ GSList *lst = get_file_list(filename, &l, func, NULL);
+ g_free(filename);
+ if (!lst)
+ continue;
+ list = g_slist_concat(list, lst);
+ len += l;
+ }
+ else if (g_file_test(filename, G_FILE_TEST_IS_REGULAR))
+ {
+ if (!func || func(filename))
+ {
+ list = g_slist_prepend(list, filename);
+ len++;
+ }
+ else
+ {
+ g_free(filename);
+ }
+ }
+ }
+ g_dir_close(dir);
+ g_free(abs_path);
+
+ if (length)
+ *length = len;
+ return list;
+}
+
Added: trunk/geany-plugins/geanyprj/src/xproject.c
===================================================================
--- trunk/geany-plugins/geanyprj/src/xproject.c (rev 0)
+++ trunk/geany-plugins/geanyprj/src/xproject.c 2009-09-08 11:28:33 UTC (rev 922)
@@ -0,0 +1,204 @@
+/*
+ * geanyprj - Alternative project support for geany light IDE.
+ *
+ * Copyright 2007 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+ * Copyright 2007 Enrico Tröger <enrico.troeger(a)uvena.de>
+ * Copyright 2007 Nick Treleaven <nick.treleaven(a)btinternet.com>
+ * Copyright 2007,2008 Yura Siamashka <yurand2(a)gmail.com>
+ *
+ * This program 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <string.h>
+#include <sys/time.h>
+
+#include "geany.h"
+#include "support.h"
+#include "prefs.h"
+#include "plugindata.h"
+#include "document.h"
+#include "filetypes.h"
+#include "utils.h"
+#include "geanyfunctions.h"
+
+#include "project.h"
+
+#include "geanyprj.h"
+
+extern GeanyData *geany_data;
+extern GeanyFunctions *geany_functions;
+
+
+struct GeanyPrj *g_current_project = NULL;
+static GPtrArray *g_projects = NULL;
+
+static void
+add_tag(G_GNUC_UNUSED gpointer key, gpointer value, G_GNUC_UNUSED gpointer user_data)
+{
+ debug("%s file=%s\n", __FUNCTION__, (const gchar *) key);
+ tm_workspace_add_object((TMWorkObject *) value);
+}
+
+static void
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Plugins GTK 2.8 build test failed at: waf build
See http://nightly.geany.org/misc/build_gtk28_plugins_stderr.log for details.
Error messages:
../../gtk28_test_plugins/codenav/src/codenavigation.c: In function 'switch_menu_item_activate':
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: 'g_strcmp0' undeclared (first use in this function)
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: (Each undeclared identifier is reported only once
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
...
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
../../gtk28_test_plugins/codenav/src/codenavigation.c:251: warning: comparison between signed and unsigned
../../gtk28_test_plugins/codenav/src/codenavigation.c:260: warning: implicit declaration of function 'g_strcmp0'
../../gtk28_test_plugins/codenav/src/codenavigation.c:311: warning: ISO C90 forbids mixed declarations and code
Build failed
-> task failed (err #1):
{task: cc codenavigation.c -> codenavigation_2.o}
http://nightly.geany.org/
Revision: 920
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=920&view=rev
Author: frlan
Date: 2009-09-07 19:01:24 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
Remove geanyVC as single project from repository as it will be developed from inside geany-plugins combined project
Removed Paths:
-------------
trunk/geanyvc/.gitignore
trunk/geanyvc/COPYING
trunk/geanyvc/ChangeLog
trunk/geanyvc/INSTALL
trunk/geanyvc/Makefile.am
trunk/geanyvc/README
trunk/geanyvc/THANKS
trunk/geanyvc/TODO
trunk/geanyvc/autogen.sh
trunk/geanyvc/commit.glade
trunk/geanyvc/configure.in
trunk/geanyvc/depcomp
trunk/geanyvc/dist/.gitignore
trunk/geanyvc/dist/PKGBUILD.in
trunk/geanyvc/dist/ebuild.in
trunk/geanyvc/dist/geninst.sh
trunk/geanyvc/dist/setup.nsi.in
trunk/geanyvc/externdiff.c
trunk/geanyvc/geanyvc.c
trunk/geanyvc/geanyvc.h
trunk/geanyvc/indent-all.sh
trunk/geanyvc/install-sh
trunk/geanyvc/makefile.win32
trunk/geanyvc/missing
trunk/geanyvc/po/.gitignore
trunk/geanyvc/po/ChangeLog
trunk/geanyvc/po/LINGUAS
trunk/geanyvc/po/POTFILES.in
trunk/geanyvc/po/POTFILES.skip
trunk/geanyvc/po/de.po
trunk/geanyvc/tests/Makefile.am
trunk/geanyvc/tests/unittests.c
trunk/geanyvc/update_web.sh
trunk/geanyvc/utils.c
trunk/geanyvc/vc_bzr.c
trunk/geanyvc/vc_cvs.c
trunk/geanyvc/vc_git.c
trunk/geanyvc/vc_hg.c
trunk/geanyvc/vc_svk.c
trunk/geanyvc/vc_svn.c
Deleted: trunk/geanyvc/.gitignore
===================================================================
--- trunk/geanyvc/.gitignore 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/.gitignore 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,22 +0,0 @@
-autom4te.cache
-Makefile
-Makefile.in
-aclocal.m4
-config.log
-config.status
-config.guess
-config.sub
-configure
-.deps
-.libs
-*.o
-*.la
-*.lo
-libtool
-*.tar.gz
-stamp-h1
-config.h
-config.h.in
-intltool-*
-mkinstalldirs
-ltmain.sh
Deleted: trunk/geanyvc/COPYING
===================================================================
--- trunk/geanyvc/COPYING 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/COPYING 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, 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 software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, 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 redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-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 give any other recipients of the Program a copy of this License
-along with the Program.
-
-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 Program or any portion
-of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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 Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) 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; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, 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 executable. 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.
-
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
-
- 5. 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 Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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.
-
- 7. 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 Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
-
-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.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the 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 Program
-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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), 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 Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. 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.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program 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 program 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 program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
Deleted: trunk/geanyvc/INSTALL
===================================================================
--- trunk/geanyvc/INSTALL 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/INSTALL 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,13 +0,0 @@
-These installation instructions are written for a GNU/Linux system.
-
-At the time of this writing, building the plugin requires a recent SVN geany (r2411+)
-installed.
-
- % configure
- % make
- % make install
-
-There is no "make uninstall" target, so if you want to remove the plugin,
-just delete the "geanyvc.so" from geany plugins directory (usually: /usr/lib/geany).
-
-
Deleted: trunk/geanyvc/Makefile.am
===================================================================
--- trunk/geanyvc/Makefile.am 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/Makefile.am 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,23 +0,0 @@
-## Makefile.am -- Process this file with automake to produce Makefile.in
-SUBDIRS = po tests
-
-EXTRA_DIST = \
- autogen.sh \
- makefile.win32 \
- intltool-extract.in \
- intltool-merge.in \
- intltool-update.in \
- indent-all.sh \
- THANKS \
- commit.glade
-
-dist_noinst_SCRIPTS = indent-all.sh
-
-noinst_HEADERS = geanyvc.h
-
-lib_LTLIBRARIES = geanyvc.la
-geanyvc_la_SOURCES = geanyvc.c externdiff.c utils.c vc_git.c vc_cvs.c vc_svn.c vc_svk.c vc_bzr.c vc_hg.c
-geanyvc_la_LDFLAGS = -module -avoid-version
-geanyvc_la_LIBADD = @GEANY_LIBS@
-
-AM_CPPFLAGS = @GEANY_CFLAGS@ -DGEANY_DISABLE_DEPRECATED -DLOCALEDIR=\""$(localedir)"\"
Deleted: trunk/geanyvc/README
===================================================================
--- trunk/geanyvc/README 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/README 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,199 +0,0 @@
-.. |(version)| replace:: 0.6
-
-=======
-geanyvc
-=======
-
-.. contents::
-
-About
-=====
-
-geanyvc is plugin that provides a uniform way of accessing the different
-version-control systems inside Geany IDE. Only small subset of vc is
-implemented, but, hey, you don't need anything besides diff, log, status,
-revert and commit most time.
-
-In order to use it you need Geany 0.16.
-
-Features
-========
-
-geanyvc currently support the following version control systems:
-
-Bazaar, GIT, Mercurial, Subversion, SVK::
-
- * diff file
- * diff directory
- * diff base directory
- * blame
- * log file
- * log directory
- * log base directory
- * status
- * revert file
- * revert directory
- * revert base directory
- * show unmodified original file
- * add file
- * remove file
- * update
- * commit
-
-CVS::
-
- * diff file
- * diff directory
- * diff base directory
- * log file
- * log directory
- * log base directory
- * status
- * revert file
- * revert directory
- * revert base directory
- * update
-
-Requirements
-============
-
-For compiling the plugin yourself, you will need the GTK (>= 2.6.0) libraries
-and header files. You will also need its dependency libraries and header
-files, such as Pango, Glib and ATK. All these files are available at
-http://www.gtk.org.
-If you like to use spellchecking for your commit
-messages you will also need gtkspell (>=2.0), but this is only optional.
-
-And obviously, you will need have Geany installed. If you have Geany installed
-from the sources, you should be ready to go.
-If you used a prepared package e.g. from your distribution you probably need
-to install an additional package, this might be called geany-dev or geany-devel.
-Please note that in order to compile and use this plugin, you need Geany 0.15
-or later.
-
-Furthermore you need, of course, a C compiler and the Make tool.
-The GNU versions of these tools are recommended.
-
-Usage
-=====
-
-After compiling and/or installing geanyvc, start Geany and go to menu
-Tools->Plugin Manager and set checkbox at VC plugin.
-
-You can configure the following options:
-
-* Set Change flag for document tabs created with pluging.
-
-If this option is activated, every new by the VC-plugin created document tab
-will be marked as changed. Even thus this option is useful in some cases, it
-could cause a big number of sometimes annoying "Do you want to save"-dialogs.
-
-* Confirm adding new files to a VCS
-
-Shows a confirmation dialog on adding a new (created) file to VCS. If not set
-you will not see dialog "Do you want to add <file>?"
-
-* Maximize commit dialog
-
-If this option is activated, commit dialog will fit the full size of your
-monitor. If it is not set commit dialog size will be 700x500.
-
-* Use external diff viewer
-
-If this option is activated and you have **meld**, **kompare**, **kdiff3**,
-**diffuse** or **tkdiff** available from command line, one of these program
-will be used to show differences for "Diff From Current File" command.
-
-* Enable CVS/GIT/SVN/SVK/Bazaar/Mercurial
-
-geanyvc detect if opened file is in version control by checking directories
-and executing commands from version control systems toolchain. These options
-disable checking for particular version control system. Disabling not
-required ones can speed up things. So it is recommended to activate svk only
-if you want to use it, since it is quiet slow.
-
-License
-=======
-
-geanyvc is distributed 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. A copy of this license
-can be found in the file COPYING included with the source code of this
-program.
-
-Ideas, questions, patches and bug reports
-=========================================
-
-If you add something, or fix a bug, please send a patch (in 'diff -u'
-format) to the geany mailing list or to one of the authors listed bellow.
-
-Coding
-======
-
-Use static functions where possible.
-Try to use GLib types and functions - e.g. g_free instead of free and
-try to use only GLib 2.6 and GTK 2.6 functions. At least for the moment,
-we want to keep the minimum requirement for GTK at 2.6.
-
-Style
-=====
-
-The file indent-all.sh contains information about
-the current code style. Run this script before commit.
-
-Download
-========
-
-The current version is:
-
-============= =============== ==========================================================
-Geany Version Geanyvc Version Download
-============= =============== ==========================================================
-0.16 0.6 http://users.cosmostv.by/yurand/geanyvc/geanyvc-0.6.tar.gz
-============= =============== ==========================================================
-
-Up to date source code can be downloaded here::
-
- svn checkout http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geanyvc
-
-If you have old version of Geany installed you need old version of plugin as well. These versions of plugin
-are no longer supported and if you find bug in one of them, it won't be fixed unless you do it yourself.
-
-============= =============== ==========================================================
-Geany Version Geanyvc Version Download
-============= =============== ==========================================================
-0.15 0.5 http://users.cosmostv.by/yurand/geanyvc/geanyvc-0.5.tar.gz
-
-0.15 0.4 http://users.cosmostv.by/yurand/geanyvc/geanyvc-0.4.tar.gz
-
-0.14 0.3 http://users.cosmostv.by/yurand/geanyvc/geanyvc-0.3.tar.gz
-
-0.13 0.2 http://users.cosmostv.by/yurand/geanyvc/geanyvc-0.2.tar.gz
-============= =============== ==========================================================
-
-Gentoo
-------
-
-Gentoo ebuild is available here: http://bugs.gentoo.org/show_bug.cgi?id=218522
-
-Arch linux
-----------
-
-A package for Arch Linux is available here: http://aur.archlinux.org/packages.php?ID=16484
-
-Source Mage
------------
-
-To install geanyvc, just run the following command::
-
- cast geanyvc
-
-Windows
--------
-
-A windows installer is available here: http://users.cosmostv.by/yurand/geanyvc/geanyvc-0.5_setup.exe
-
---
-2007-2008 by Yura Siamashka and Frank Lanitz
-yurand2(at)gmail(dot)com
-frank(at)frank(dot)uvena(dot)de
Deleted: trunk/geanyvc/THANKS
===================================================================
--- trunk/geanyvc/THANKS 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/THANKS 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,15 +0,0 @@
-What's this file about?
------------------------
-This file lists all external people that have contributed to this project.
-
-Testers and contributors:
--------------------------
-Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - some patches
-Enrico Troeger <enrico(dot)troeger(at)uvena(dot)de> - Geany IDE author, some patches and testing
-Jeff Pohlmeyer <yetanothergeek(at)gmail(dot)com> - INSTALL instructions stolen from him.
-Karel Kolman <kolmis(at)gmail(dot)com> - Bazaar support.
-David Kalnischkies <kalnischkies(at)gmail(dot)com> - Mercurial support
-
-Projects
---------
-Sylpheed
Deleted: trunk/geanyvc/TODO
===================================================================
--- trunk/geanyvc/TODO 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/TODO 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,11 +0,0 @@
-* fix mess with local and utf8 encodings.
-* implement in_vc_cvs function.
-* implement cvs commit command.
-* implement cvs blame(?) command.
-* option external diff program.
-* check windows build for problems with stdout/stderr output
-* (add spellchecking to commit dialog)
-* (add function to change branches for VCS that support it)
-* (add auto wrapping long line at commit dialog)
-* (add commit function for a single file)
-* (add git bisec support)
Deleted: trunk/geanyvc/autogen.sh
===================================================================
--- trunk/geanyvc/autogen.sh 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/autogen.sh 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,159 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-DIE=0
-
-if [ -n "$GNOME2_DIR" ]; then
- ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"
- LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH"
- PATH="$GNOME2_DIR/bin:$PATH"
- export PATH
- export LD_LIBRARY_PATH
-fi
-
-(test -f $srcdir/configure.in) || {
- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
- echo " top-level package directory"
- exit 1
-}
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`autoconf' installed."
- echo "Download the appropriate package for your distribution,"
- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
-}
-
-(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
- (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`intltool' installed."
- echo "You can get it from:"
- echo " ftp://ftp.gnome.org/pub/GNOME/"
- DIE=1
- }
-}
-
-(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.in >/dev/null) && {
- (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`xml-i18n-toolize' installed."
- echo "You can get it from:"
- echo " ftp://ftp.gnome.org/pub/GNOME/"
- DIE=1
- }
-}
-
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
- (libtool --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`libtool' installed."
- echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
- }
-}
-
-(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.in >/dev/null) && {
- (grep "sed.*POTFILES" $srcdir/configure.in) > /dev/null || \
- (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`glib' installed."
- echo "You can get it from: ftp://ftp.gtk.org/pub/gtk"
- DIE=1
- }
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`automake' installed."
- echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
- NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: Missing \`aclocal'. The version of \`automake'"
- echo "installed doesn't appear recent enough."
- echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
-}
-
-if test "$DIE" -eq 1; then
- exit 1
-fi
-
-if test -z "$*"; then
- echo "**Warning**: I am going to run \`configure' with no arguments."
- echo "If you wish to pass any to it, please specify them on the"
- echo \`$0\'" command line."
- echo
-fi
-
-case $CC in
-xlc )
- am_opt=--include-deps;;
-esac
-
-for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.in -print`
-do
- dr=`dirname $coin`
- if test -f $dr/NO-AUTO-GEN; then
- echo skipping $dr -- flagged as no auto-gen
- else
- echo processing $dr
- ( cd $dr
-
- aclocalinclude="$ACLOCAL_FLAGS"
-
- if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
- echo "Creating $dr/aclocal.m4 ..."
- test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
- echo "Running glib-gettextize... Ignore non-fatal messages."
- echo "no" | glib-gettextize --force --copy
- echo "Making $dr/aclocal.m4 writable ..."
- test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
- fi
- if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
- echo "Running intltoolize..."
- intltoolize --copy --force --automake
- fi
- if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then
- echo "Running xml-i18n-toolize..."
- xml-i18n-toolize --copy --force --automake
- fi
- if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
- if test -z "$NO_LIBTOOLIZE" ; then
- echo "Running libtoolize..."
- libtoolize --force --copy
- fi
- fi
- echo "Running aclocal $aclocalinclude ..."
- aclocal $aclocalinclude
- if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
- echo "Running autoheader..."
- autoheader
- fi
- echo "Running automake --gnu $am_opt ..."
- automake --add-missing --gnu $am_opt
- echo "Running autoconf ..."
- autoconf
- )
- fi
-done
-
-conf_flags="--enable-maintainer-mode"
-
-if test x$NOCONFIGURE = x; then
- echo Running $srcdir/configure $conf_flags "$@" ...
- $srcdir/configure $conf_flags "$@" \
- && echo Now type \`make\' to compile. || exit 1
-else
- echo Skipping configure process.
-fi
Deleted: trunk/geanyvc/commit.glade
===================================================================
--- trunk/geanyvc/commit.glade 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/commit.glade 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.2.2 on Thu Nov 29 23:29:48 2007 by yura@localhost-->
-<glade-interface>
- <widget class="GtkDialog" id="commitDialog">
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Commit</property>
- <property name="modal">True</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="destroy_with_parent">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkVPaned" id="vpaned1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <child>
- <widget class="GtkTreeView" id="treeSelect">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_clickable">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="resize">False</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVPaned" id="vpaned2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <widget class="GtkTextView" id="textDiff">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="editable">False</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame1">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <child>
- <widget class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <widget class="GtkTextView" id="textCommitMessage">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"><b>Commit message:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <child>
- <widget class="GtkButton" id="btnCancel">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="response_id">-6</property>
- </widget>
- </child>
- <child>
- <widget class="GtkButton" id="btnCommit">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">_Commit</property>
- <property name="response_id">-10</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-</glade-interface>
Deleted: trunk/geanyvc/configure.in
===================================================================
--- trunk/geanyvc/configure.in 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/configure.in 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,94 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT([geanyvc], [0.6], [yurand2(a)gmail.com])
-AM_INIT_AUTOMAKE([1.9 foreign])
-
-AM_CONFIG_HEADER(config.h)
-
-AC_PROG_CC
-
-AC_DISABLE_STATIC
-AM_PROG_LIBTOOL
-LIBTOOL="$LIBTOOL --silent"
-
-AC_PROG_INSTALL
-AC_PROG_INTLTOOL
-
-
-# checking for Geany
-PKG_CHECK_MODULES(GEANY, [geany >= 0.18])
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
-
-GEANY_VERSION=`$PKG_CONFIG --modversion geany`
-GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
-
-
-dnl Check for GtkSpell support
-AC_MSG_CHECKING([whether to use GtkSpell])
-AC_ARG_ENABLE(gtkspell,
- [ --disable-gtkspell Do not use GtkSpell in editor],
- [ac_cv_enable_gtkspell=$enableval], [ac_cv_enable_gtkspell=yes])
-if test "$ac_cv_enable_gtkspell" = yes; then
- AC_MSG_RESULT(yes)
- AC_MSG_CHECKING([whether GtkSpell is available])
- if $PKG_CONFIG gtkspell-2.0 ; then
- AC_MSG_RESULT(yes)
- CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gtkspell-2.0`"
- LIBS="$LIBS `$PKG_CONFIG --libs gtkspell-2.0`"
- AC_DEFINE(USE_GTKSPELL, 1, Use GtkSpell in editor)
- else
- AC_MSG_RESULT(no)
- ac_cv_enable_gtkspell=no
- fi
-else
- AC_MSG_RESULT(no)
-fi
-
-# i18n
-GETTEXT_PACKAGE=geanyvc
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
-
-ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`" # take all languages found in file po/LINGUAS
-
-AM_GLIB_GNU_GETTEXT
-# workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845)
-if test "x$MSGFMT" = "xno"; then
- AC_MSG_ERROR([msgfmt not found. Please install the gettext package.])
-fi
-
-# intltool hack to define install_sh on Debian/Ubuntu systems
-if test "x$install_sh" = "x"; then
- install_sh="`pwd`/install-sh"
- AC_SUBST(install_sh)
-fi
-
-# get the plugin installed at the correct location for Geany
-# TODO find a way to NOT override --libdir command line option if given
-libdir="`$PKG_CONFIG --variable=libdir geany`/geany"
-
-dnl unittests
-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], [
-AC_SUBST(CHECK_CFLAGS)
-AC_SUBST(CHECK_LIBS)
-AM_CONDITIONAL(UNITTESTS, true)
-], [
-AM_CONDITIONAL(UNITTESTS, false)
-])
-
-
-AC_OUTPUT([
-Makefile
-po/Makefile.in
-tests/Makefile
-])
-
-echo "----------------------------------------"
-echo "Install geanyvc in : ${libdir}"
-echo "Using Geany version : ${GEANY_VERSION}"
-echo "Using GTK version : ${GTK_VERSION}"
-echo "Building with GtkSpell support : ${ac_cv_enable_gtkspell}"
-echo ""
-echo "Configuration is done OK."
-echo ""
Deleted: trunk/geanyvc/depcomp
===================================================================
--- trunk/geanyvc/depcomp 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/depcomp 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,584 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2006-10-15.18
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
-# Foundation, Inc.
-
-# This program 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, or (at your option)
-# any later version.
-
-# This program 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 program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva(a)dcc.unicamp.br>.
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
- depmode Dependency tracking mode.
- source Source file read by `PROGRAMS ARGS'.
- object Object file output by `PROGRAMS ARGS'.
- DEPDIR directory where to store dependencies.
- depfile Dependency file to output.
- tmpdepfile Temporary file to use when outputing dependencies.
- libtool Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake(a)gnu.org>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "depcomp $scriptversion"
- exit $?
- ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
- echo "depcomp: Variables source, object and depmode must be set" 1>&2
- exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
- sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags. We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write. Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
- # HP compiler uses -M and no extra arg.
- gccflag=-M
- depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
- # This is just like dashmstdout with a different argument.
- dashmflag=-xM
- depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want. Yay! Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff. Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am. Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
- for arg
- do
- case $arg in
- -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
- *) set fnord "$@" "$arg" ;;
- esac
- shift # fnord
- shift # $arg
- done
- "$@"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- mv "$tmpdepfile" "$depfile"
- ;;
-
-gcc)
-## There are various ways to get dependency output from gcc. Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-## up in a subdir. Having to rename by hand is ugly.
-## (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-## than renaming).
- if test -z "$gccflag"; then
- gccflag=-MD,
- fi
- "$@" -Wp,"$gccflag$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
- sed -e 's/^[^:]*: / /' \
- -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header). We avoid this by adding
-## dummy dependencies for each header file. Too bad gcc doesn't do
-## this for us directly.
- tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'. On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-hp)
- # This case exists only to let depend.m4 do its work. It works by
- # looking at the text of this script. This case will never be run,
- # since it is checked for above.
- exit 1
- ;;
-
-sgi)
- if test "$libtool" = yes; then
- "$@" "-Wp,-MDupdate,$tmpdepfile"
- else
- "$@" -MDupdate "$tmpdepfile"
- fi
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
-
- if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
- echo "$object : \\" > "$depfile"
-
- # Clip off the initial element (the dependent). Don't try to be
- # clever and replace this with sed code, as IRIX sed won't handle
- # lines with more than a fixed number of characters (4096 in
- # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like `#:fec' to the end of the
- # dependency line.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr '
-' ' ' >> $depfile
- echo >> $depfile
-
- # The second pass generates a dummy entry for each header file.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> $depfile
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-aix)
- # The C for AIX Compiler uses -M and outputs the dependencies
- # in a .u file. In older versions, this file always lives in the
- # current directory. Also, the AIX compiler puts `$object:' at the
- # start of each line; $object doesn't have directory information.
- # Version 6 uses the directory in both cases.
- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
- tmpdepfile="$stripped.u"
- if test "$libtool" = yes; then
- "$@" -Wc,-M
- else
- "$@" -M
- fi
- stat=$?
-
- if test -f "$tmpdepfile"; then :
- else
- stripped=`echo "$stripped" | sed 's,^.*/,,'`
- tmpdepfile="$stripped.u"
- fi
-
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
-
- if test -f "$tmpdepfile"; then
- outname="$stripped.o"
- # Each line is of the form `foo.o: dependent.h'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-icc)
- # Intel's C compiler understands `-MD -MF file'. However on
- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
- # ICC 7.0 will fill foo.d with something like
- # foo.o: sub/foo.c
- # foo.o: sub/foo.h
- # which is wrong. We want:
- # sub/foo.o: sub/foo.c
- # sub/foo.o: sub/foo.h
- # sub/foo.c:
- # sub/foo.h:
- # ICC 7.1 will output
- # foo.o: sub/foo.c sub/foo.h
- # and will wrap long lines using \ :
- # foo.o: sub/foo.c ... \
- # sub/foo.h ... \
- # ...
-
- "$@" -MD -MF "$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- # Each line is of the form `foo.o: dependent.h',
- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
- # Some versions of the HPUX 10.20 sed can't process this invocation
- # correctly. Breaking it into two sed invocations is a workaround.
- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
- sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-hp2)
- # The "hp" stanza above does not work with aCC (C++) and HP's ia64
- # compilers, which have integrated preprocessors. The correct option
- # to use with these is +Maked; it writes dependencies to a file named
- # 'foo.d', which lands next to the object file, wherever that
- # happens to be.
- # Much of this is similar to the tru64 case; see comments there.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
- if test "$libtool" = yes; then
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir.libs/$base.d
- "$@" -Wc,+Maked
- else
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir$base.d
- "$@" +Maked
- fi
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add `dependent.h:' lines.
- sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile" "$tmpdepfile2"
- ;;
-
-tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in `foo.d' instead, so we check for that too.
- # Subdirectories are respected.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
- if test "$libtool" = yes; then
- # With Tru64 cc, shared objects can also be used to make a
- # static library. This mechanism is used in libtool 1.4 series to
- # handle both shared and static libraries in a single compilation.
- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
- #
- # With libtool 1.5 this exception was removed, and libtool now
- # generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in $dir.libs/$base.o.d and
- # in $dir$base.o.d. We have to check for both files, because
- # one of the two compilations can be disabled. We should prefer
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
- # automatically cleaned when .libs/ is deleted, while ignoring
- # the former would cause a distcleancheck panic.
- tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
- tmpdepfile2=$dir$base.o.d # libtool 1.5
- tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
- tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
- "$@" -Wc,-MD
- else
- tmpdepfile1=$dir$base.o.d
- tmpdepfile2=$dir$base.d
- tmpdepfile3=$dir$base.d
- tmpdepfile4=$dir$base.d
- "$@" -MD
- fi
-
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-#nosideeffect)
- # This comment above is used by automake to tell side-effect
- # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout, regardless of -o.
- "$@" || exit $?
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
- shift
- done
- shift
- fi
-
- # Remove `-o $object'.
- IFS=" "
- for arg
- do
- case $arg in
- -o)
- shift
- ;;
- $object)
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift # fnord
- shift # $arg
- ;;
- esac
- done
-
- test -z "$dashmflag" && dashmflag=-M
- # Require at least two characters before searching for `:'
- # in the target name. This is to cope with DOS-style filenames:
- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
- "$@" $dashmflag |
- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-dashXmstdout)
- # This case only exists to satisfy depend.m4. It is never actually
- # run, as this mode is specially recognized in the preamble.
- exit 1
- ;;
-
-makedepend)
- "$@" || exit $?
- # Remove any Libtool call
- if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
- shift
- done
- shift
- fi
- # X makedepend
- shift
- cleared=no
- for arg in "$@"; do
- case $cleared in
- no)
- set ""; shift
- cleared=yes ;;
- esac
- case "$arg" in
- -D*|-I*)
- set fnord "$@" "$arg"; shift ;;
- # Strip any option that makedepend may not understand. Remove
- # the object too, otherwise makedepend will parse it as a source file.
- -*|$object)
- ;;
- *)
- set fnord "$@" "$arg"; shift ;;
- esac
- done
- obj_suffix="`echo $object | sed 's/^.*\././'`"
- touch "$tmpdepfile"
- ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile" "$tmpdepfile".bak
- ;;
-
-cpp)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout.
- "$@" || exit $?
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
- shift
- done
- shift
- fi
-
- # Remove `-o $object'.
- IFS=" "
- for arg
- do
- case $arg in
- -o)
- shift
- ;;
- $object)
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift # fnord
- shift # $arg
- ;;
- esac
- done
-
- "$@" -E |
- sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
- sed '$ s: \\$::' > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- cat < "$tmpdepfile" >> "$depfile"
- sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-msvisualcpp)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout, regardless of -o,
- # because we must use -o when running libtool.
- "$@" || exit $?
- IFS=" "
- for arg
- do
- case "$arg" in
- "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
- set fnord "$@"
- shift
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift
- shift
- ;;
- esac
- done
- "$@" -E |
- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
- echo " " >> "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-none)
- exec "$@"
- ;;
-
-*)
- echo "Unknown depmode $depmode" 1>&2
- exit 1
- ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
Deleted: trunk/geanyvc/dist/.gitignore
===================================================================
--- trunk/geanyvc/dist/.gitignore 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/dist/.gitignore 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,3 +0,0 @@
-PKGBUILD
-*.ebuild
-*.nsi
Deleted: trunk/geanyvc/dist/PKGBUILD.in
===================================================================
--- trunk/geanyvc/dist/PKGBUILD.in 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/dist/PKGBUILD.in 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,22 +0,0 @@
-# Contributor: Yura Siamashka <yurand2(a)gmail.com>
-pkgname=geanyvc
-pkgver=VERSION
-pkgrel=1
-pkgdesc="Version control systems plugin for Geany IDE"
-arch=(i686 x86_64)
-url="http://geany-plugins.sourceforge.net/geanyvc/"
-license=("GPL")
-depends=('geany>=0.16')
-makedepends=('intltool')
-conflicts=()
-replaces=()
-backup=()
-install=
-source=(http://users.cosmostv.by/yurand/$pkgname/$pkgname-$pkgver.tar.gz)
-
-build() {
- cd $startdir/src/$pkgname-$pkgver
- ./configure --prefix=/usr || return 1
- make || return 1
- make install DESTDIR=$startdir/pkg || return 1
-}
Deleted: trunk/geanyvc/dist/ebuild.in
===================================================================
--- trunk/geanyvc/dist/ebuild.in 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/dist/ebuild.in 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,26 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="Version control systems plugin for Geany IDE"
-HOMEPAGE="http://geany-plugins.sourceforge.net/geanyvc/"
-SRC_URI="http://users.cosmostv.by/yurand/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-util/geany-0.16"
-
-DEPEND="${RDEPEND}"
-
-src_compile() {
- econf || die "econf failed."
- emake || die "emake failed."
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
-}
-
Deleted: trunk/geanyvc/dist/geninst.sh
===================================================================
--- trunk/geanyvc/dist/geninst.sh 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/dist/geninst.sh 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# Generate PKGBUILD, spec and ebuild files
-#
-
-PKGNAME=`cat ../configure.in | awk '/AC_INIT/ {split($0, a, "["); v = a[2]; sub("\\\], ", "", v);print v;}'`
-VERSION=`cat ../configure.in | awk '/AC_INIT/ {split($0, a, "["); v = a[3]; sub("\\\], ", "", v);print v;}'`
-
-MD5SUM=`md5sum ../${PKGNAME}-${VERSION}.tar.gz | awk '// {print $1}'`
-
-if [ -f PKGBUILD.in ]; then
- awk -v md5=$MD5SUM -v ver=$VERSION '/VERSION/ {gsub("VERSION",ver,$0);} // {print} /^source=/ {printf("md5sums=(%s)\n", md5)}' < PKGBUILD.in > PKGBUILD
-fi
-
-if [ -f ebuild.in ]; then
- cp ebuild.in ${PKGNAME}-${VERSION}.ebuild
-fi
-
-if [ -f setup.nsi.in ]; then
- cat setup.nsi.in | sed s/VERSION/${VERSION}/g | sed s/PKGNAME/${PKGNAME}/g > ${PKGNAME}.nsi
-fi
Deleted: trunk/geanyvc/dist/setup.nsi.in
===================================================================
--- trunk/geanyvc/dist/setup.nsi.in 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/dist/setup.nsi.in 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,43 +0,0 @@
-!include "StrFunc.nsh"
-
-${StrRep}
-
-; The name of the installer
-Name "PKGNAME"
-
-; The file to write
-OutFile "PKGNAME-VERSION_setup.exe"
-
-SetCompressor /SOLID lzma
-
-; Request application privileges for Windows Vista
-RequestExecutionLevel user
-
-LicenseData ../COPYING
-
-;;;;;;;;;;;;;;;;
-; Init code ;
-;;;;;;;;;;;;;;;;
-Function .onInit
- ReadRegStr $R0 "HKLM" "Software\Microsoft\Windows\CurrentVersion\Uninstall\Geany" "UninstallString"
- StrCmp $R0 "" warning
- ${StrRep} $INSTDIR $R0 "uninst.exe" "lib"
- goto done
- warning:
- MessageBox MB_OK|MB_ICONEXCLAMATION "You need install geany first."
- done:
-FunctionEnd
-
-
-; Pages
-Page license
-Page directory
-Page instfiles
-
-Section ""
- ; Set output path to the installation directory.
- SetOutPath $INSTDIR
-
- ; Put file there
- File ..\PKGNAME.dll
-SectionEnd
Deleted: trunk/geanyvc/externdiff.c
===================================================================
--- trunk/geanyvc/externdiff.c 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/externdiff.c 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,76 +0,0 @@
-/*
- * externdiff.h - Plugin to geany light IDE to work with vc
- *
- * Copyright 2008 Yura Siamashka <yurand2(a)gmail.com>
- *
- * This program 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 program 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 program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <string.h>
-
-#include "geanyplugin.h"
-#include "geanyvc.h"
-
-extern GeanyFunctions *geany_functions;
-
-enum
-{
- EXTERNAL_DIFF_MELD,
- EXTERNAL_DIFF_KOMPARE,
- EXTERNAL_DIFF_KDIFF3,
- EXTERNAL_DIFF_DIFFUSE,
- EXTERNAL_DIFF_TKDIFF,
- EXTERNAL_DIFF_COUNT
-};
-
-static gchar *viewers[EXTERNAL_DIFF_COUNT] = { "meld", "kompare", "kdiff3", "diffuse", "tkdiff" };
-
-static gchar *extern_diff_viewer = NULL;
-const gchar *
-get_external_diff_viewer()
-{
- gint i;
-
- if (extern_diff_viewer)
- return extern_diff_viewer;
-
- for (i = 0; i < EXTERNAL_DIFF_COUNT; i++)
- {
- if (g_find_program_in_path(viewers[i]))
- {
- extern_diff_viewer = viewers[i];
- return extern_diff_viewer;
- }
- }
- return NULL;
-}
-
-void
-vc_external_diff(const gchar * src, const gchar * dest)
-{
- gchar *argv[4] = { NULL, NULL, NULL, NULL };
-
- const gchar *diff = get_external_diff_viewer();
- if (!diff)
- return;
-
- argv[0] = (gchar *) diff;
- argv[1] = (gchar *) src;
- argv[2] = (gchar *) dest;
-
- utils_spawn_sync(NULL, argv, NULL,
- G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL |
- G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-}
Deleted: trunk/geanyvc/geanyvc.c
===================================================================
--- trunk/geanyvc/geanyvc.c 2009-09-07 19:00:22 UTC (rev 919)
+++ trunk/geanyvc/geanyvc.c 2009-09-07 19:01:24 UTC (rev 920)
@@ -1,2285 +0,0 @@
-/*
- * geanyvc.c - Plugin to geany light IDE to work with vc
- *
- * Copyright 2007-2009 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
- * Copyright 2007-2009 Enrico Tröger <enrico.troeger(a)uvena.de>
- * Copyright 2007 Nick Treleaven <nick.treleaven(a)btinternet.com>
- * Copyright 2007-2009 Yura Siamashka <yurand2(a)gmail.com>
- *
- * This program 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 program 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 program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/* VC plugin */
-/* This plugin allow to works with cvs/svn/git inside geany light IDE. */
-
-#include <string.h>
-#include <glib.h>
-#include <glib/gstdio.h>
-#include <unistd.h>
-
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
-#include "geanyvc.h"
-#include "geanyplugin.h"
-#include "SciLexer.h"
-
-#include <config.h>
-
-#ifdef USE_GTKSPELL
-#include <gtkspell/gtkspell.h>
-#endif
-
-
-
-PluginFields *plugin_fields;
-GeanyData *geany_data;
-GeanyFunctions *geany_functions;
-
-PLUGIN_VERSION_CHECK(115);
-PLUGIN_SET_INFO(_("VC"), _("Interface to different Version Control systems."), VERSION,
- _("Yura Siamashka <yurand2(a)gmail.com>,\nFrank Lanitz <frank(a)frank.uvena.de>"));
-
-/* Some global variables */
-static gboolean set_changed_flag;
-static gboolean set_add_confirmation;
-static gboolean set_maximize_commit_dialog;
-static gboolean set_external_diff;
-static gboolean set_editor_menu_entries;
-
-static gchar *config_file;
-
-static gboolean enable_cvs;
-static gboolean enable_git;
-static gboolean enable_svn;
-static gboolean enable_svk;
-static gboolean enable_bzr;
-static gboolean enable_hg;
-
-#ifdef USE_GTKSPELL
-static gchar *lang;
-#endif
-
-static GSList *VC = NULL;
-
-/* The addresses of these strings act as enums, their contents are not used. */
-/* absolute path dirname of file */
-const gchar ABS_DIRNAME[] = "*ABS_DIRNAME*";
-/* absolute path filename of file */
-const gchar ABS_FILENAME[] = "*ABS_FILENAME*";;
-
-/* path to directory from base vc directory */
-const gchar BASE_DIRNAME[] = "*BASE_DIRNAME*";
-/* path to file from base vc directory */
-const gchar BASE_FILENAME[] = "*BASE_FILENAME*";
-
-/* basename of file */
-const gchar BASENAME[] = "*BASENAME*";
-/* list with absolute file names*/
-const gchar FILE_LIST[] = "*FILE_LIST*";
-/* message */
-const gchar MESSAGE[] = "*MESSAGE*";
-
-
-/* this string is used when action require to run several commands */
-const gchar CMD_SEPARATOR[] = "*CMD-SEPARATOR*";
-const gchar CMD_FUNCTION[] = "*CUSTOM_FUNCTION*";
-
-/* commit status */
-const gchar FILE_STATUS_MODIFIED[] = "Modified";
-const gchar FILE_STATUS_ADDED[] = "Added";
-const gchar FILE_STATUS_DELETED[] = "Deleted";
-const gchar FILE_STATUS_UNKNOWN[] = "Unknown";
-
-static GtkWidget *editor_menu_vc = NULL;
-static GtkWidget *editor_menu_commit = NULL;
-static GtkWidget *menu_item_sep = NULL;
-
-static void registrate();
-static void add_menuitems_to_editor_menu();
-static void remove_menuitems_from_editor_menu();
-
-
-/* Doing some basic keybinding stuff */
-enum
-{
- VC_DIFF_FILE,
- VC_DIFF_DIR,
- VC_DIFF_BASEDIR,
- VC_COMMIT,
- VC_STATUS,
- VC_UPDATE,
- VC_REVERT_FILE,
- VC_REVERT_DIR,
- VC_REVERT_BASEDIR,
- COUNT_KB
-};
-
-PLUGIN_KEY_GROUP(geanyvc, COUNT_KB)
- GSList *get_commit_files_null(G_GNUC_UNUSED const gchar * dir)
-{
- return NULL;
-}
-
-static void
-free_text_list(GSList * lst)
-{
- GSList *tmp;
- if (!lst)
- return;
- for (tmp = lst; tmp != NULL; tmp = g_slist_next(tmp))
- {
- g_free((CommitItem *) (tmp->data));
- }
- g_slist_free(lst);
-}
-
-static void
-free_commit_list(GSList * lst)
-{
- GSList *tmp;
- if (!lst)
- return;
- for (tmp = lst; tmp != NULL; tmp = g_slist_next(tmp))
- {
- g_free(((CommitItem *) (tmp->data))->path);
- g_free((CommitItem *) (tmp->data));
- }
- g_slist_free(lst);
-}
-
-gchar *
-find_subdir_path(const gchar * filename, const gchar * subdir)
-{
- gboolean ret = FALSE;
- gchar *base;
- gchar *gitdir;
- gchar *base_prev = g_strdup(":");
-
- if (g_file_test(filename, G_FILE_TEST_IS_DIR))
- base = g_strdup(filename);
- else
- base = g_path_get_dirname(filename);
-
- while (strcmp(base, base_prev) != 0)
- {
- gitdir = g_build_filename(base, subdir, NULL);
- ret = g_file_test(gitdir, G_FILE_TEST_IS_DIR);
- g_free(gitdir);
- if (ret)
- break;
- g_free(base_prev);
- base_prev = base;
- base = g_path_get_dirname(base);
- }
-
- g_free(base_prev);
- if (ret)
- return base;
- g_free(base);
- return NULL;
-}
-
-static gboolean
-find_subdir(const gchar * filename, const gchar * subdir)
-{
- gchar *basedir;
- basedir = find_subdir_path(filename, subdir);
- if (basedir)
- {
- g_free(basedir);
- return TRUE;
- }
- return FALSE;
-}
-
-gboolean
-find_dir(const gchar * filename, const char *find, gboolean recursive)
-{
- gboolean ret;
- gchar *base;
- gchar *dir;
-
- if (!filename)
- return FALSE;
-
- if (recursive)
- {
- ret = find_subdir(filename, find);
- }
- else
- {
- if (g_file_test(filename, G_FILE_TEST_IS_DIR))
- base = g_strdup(filename);
- else
- base = g_path_get_dirname(filename);
- dir = g_build_filename(base, find, NULL);
-
- ret = g_file_test(dir, G_FILE_TEST_IS_DIR);
-
- g_free(base);
- g_free(dir);
- }
- return ret;
-}
-
-
-static const VC_RECORD *
-find_vc(const char *filename)
-{
- GSList *tmp;
-
- for (tmp = VC; tmp != NULL; tmp = g_slist_next(tmp))
- {
- if (((VC_RECORD *) tmp->data)->in_vc(filename))
- {
- return (VC_RECORD *) tmp->data;
- }
- }
- return NULL;
-}
-
-static void *
-find_cmd_env(gint cmd_type, gboolean cmd, const gchar * filename)
-{
- const VC_RECORD *vc;
- vc = find_vc(filename);
- if (vc)
- {
- if (cmd)
- return vc->commands[cmd_type].command;
- else
- return vc->commands[cmd_type].env;
- }
- return NULL;
-}
-
-/* Get list of commands for given command spec*/
-static GSList *
-get_cmd(const gchar ** argv, const gchar * dir, const gchar * filename, GSList * filelist,
- const gchar * message)
-{
- gint i, j;
- gint len = 0;
- gchar **ret;
- gchar *abs_dir;
- gchar *base_filename;
- gchar *base_dirname;
- gchar *basename;
- GSList *head = NULL;
- GSList *tmp;
- GString *repl;
-
- if (g_file_test(filename, G_FILE_TEST_IS_DIR))
- abs_dir = g_strdup(filename);
- else
- abs_dir = g_path_get_dirname(filename);
- basename = g_path_get_basename(filename);
- base_filename = get_relative_path(dir, filename);
- base_dirname = get_relative_path(dir, abs_dir);
-
- while (1)
- {
- if (argv[len] == NULL)
- break;
- len++;
- }
- if (filelist)
- ret = g_malloc0(sizeof(gchar *) * (len * g_slist_length(filelist) + 1));
- else
- ret = g_malloc0(sizeof(gchar *) * (len + 1));
-
- head = g_slist_alloc();
- head->data = ret;
-
- for (i = 0, j = 0; i < len; i++, j++)
- {
- if (argv[i] == CMD_SEPARATOR)
- {
- if (filelist)
- ret = g_malloc0(sizeof(gchar *) *
- (len * g_slist_length(filelist) + 1));
- else
- ret = g_malloc0(sizeof(gchar *) * (len + 1));
- j = -1;
- head = g_slist_append(head, ret);
- }
- else if (argv[i] == ABS_DIRNAME)
- {
- ret[j] = utils_get_locale_from_utf8(abs_dir);
- }
- else if (argv[i] == ABS_FILENAME)
- {
- ret[j] = utils_get_locale_from_utf8(filename);
- }
- else if (argv[i] == BASE_DIRNAME)
- {
- ret[j] = utils_get_locale_from_utf8(base_dirname);
- }
- else if (argv[i] == BASE_FILENAME)
- {
- ret[j] = utils_get_locale_from_utf8(base_filename);
- }
- else if (argv[i] == BASENAME)
- {
- ret[j] = utils_get_locale_from_utf8(basename);
- }
- else if (argv[i] == FILE_LIST)
- {
- for (tmp = filelist; tmp != NULL; tmp = g_slist_next(tmp))
- {
- ret[j] = utils_get_locale_from_utf8((gchar *) tmp->data);
- j++;
- }
- j--;
- }
- else if (argv[i] == MESSAGE)
- {
- ret[j] = utils_get_locale_from_utf8(message);
- }
- else
- {
- repl = g_string_new(argv[i]);
- utils_string_replace_all(repl, P_ABS_DIRNAME, abs_dir);
- utils_string_replace_all(repl, P_ABS_FILENAME, filename);
- utils_string_replace_all(repl, P_BASENAME, basename);
- ret[j] = g_string_free(repl, FALSE);
- setptr(ret[j], utils_get_locale_from_utf8(ret[j]));
- }
- }
- g_free(abs_dir);
- g_free(base_dirname);
- g_free(base_filename);
- g_free(basename);
- return head;
-}
-
-
-/* name should be in UTF-8, and can have a path. */
-static void
-show_output(const gchar * std_output, const gchar * name,
- const gchar * force_encoding, GeanyFiletype * ftype)
-{
- gint page;
- GtkNotebook *book;
- GeanyDocument *doc, *cur_doc;
-
- if (std_output)
- {
- cur_doc = document_get_current();
- doc = document_find_by_filename(name);
- if (doc == NULL)
- {
- doc = document_new_file(name, ftype, std_output);
- }
- else
- {
- sci_set_text(doc->editor->sci, std_output);
- if (ftype)
- document_set_filetype(doc, ftype);
- book = GTK_NOTEBOOK(geany->main_widgets->notebook);
- page = gtk_notebook_page_num(book, GTK_WIDGET(doc->editor->sci));
- gtk_notebook_set_current_page(book, page);
- }
- document_set_text_changed(doc, set_changed_flag);
- document_set_encoding(doc, (force_encoding ? force_encoding : "UTF-8"));
- navqueue_goto_line(cur_doc, doc, 1);
- }
- else
- {
- ui_set_statusbar(FALSE, _("Could not parse the output of command"));
- }
-}
-
-/*
- * Execute command by command spec, return std_out std_err
- *
- * @dir - start directory of command
- * @argv - command spec
- * @env - envirounment
- * @std_out - if not NULL here will be returned standard output converted to utf8 of last command in spec
- * @std_err - if not NULL here will be returned standard error converted to utf8 of last command in spec
- * @filename - filename for spec, commands will be running in it's basedir . Used to replace FILENAME, BASE_FILENAME in spec
- * @list - used to replace FILE_LIST in spec
- * @message - used to replace MESSAGE in spec
- *
- * @return - exit code of last command in spec
- */
-gint
-execute_custom_command(const gchar * dir, const gchar ** argv, const gchar ** env, gchar ** std_out,
- gchar ** std_err, const gchar * filename, GSList * list,
- const gchar * message)
-{
- gint exit_code;
- GString *tmp;
- GSList *cur;
- GSList *largv = get_cmd(argv, dir, filename, list, message);
- GError *error = NULL;
-
- if (std_out)
- *std_out = NULL;
- if (std_err)
- *std_err = NULL;
-
- if (!largv)
- {
- return 0;
- }
- for (cur = largv; cur != NULL; cur = g_slist_next(cur))
- {
- argv = cur->data;
- if (cur != g_slist_last(largv))
- {
- utils_spawn_sync(dir, cur->data, (gchar **) env,
- G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL |
- G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, NULL, NULL,
- &exit_code, &error);
- }
- else
- {
- utils_spawn_sync(dir, cur->data, (gchar **) env,
- G_SPAWN_SEARCH_PATH | (std_out ? 0 :
- G_SPAWN_STDOUT_TO_DEV_NULL) |
- (std_err ? 0 : G_SPAWN_STDERR_TO_DEV_NULL), NULL, NULL,
- std_out, std_err, &exit_code, &error);
- }
- if (error)
- {
- g_warning("geanyvc: s_spawn_sync error: %s", error->message);
- ui_set_statusbar(FALSE, _("geanyvc: s_spawn_sync error: %s"),
- error->message);
- g_error_free(error);
- }
-
- // need to convert output text from the encoding of the original file into
- // UTF-8 because internally Geany always needs UTF-8
- if (std_out && *std_out)
- {
- tmp = g_string_new(*std_out);
- utils_string_replace_all(tmp, "\r\n", "\n");
- utils_string_replace_all(tmp, "\r", "\n");
- setptr(*std_out, g_string_free(tmp, FALSE));
-
- if (!g_utf8_validate(*std_out, -1, NULL))
- {
- setptr(*std_out, encodings_convert_to_utf8(*std_out,
- strlen(*std_out), NULL));
- }
- if (!NZV(*std_out))
- {
- g_free(*std_out);
- *std_out = NULL;
- }
- }
- if (std_err && *std_err)
- {
- tmp = g_string_new(*std_err);
- utils_string_replace_all(tmp, "\r\n", "\n");
- utils_string_replace_all(tmp, "\r", "\n");
- setptr(*std_err, g_string_free(tmp, FALSE));
-
- if (!g_utf8_validate(*std_err, -1, NULL))
- {
- setptr(*std_err, encodings_convert_to_utf8(*std_err,
- strlen(*std_err), NULL));
- }
- if (!NZV(*std_err))
- {
- g_free(*std_err);
- *std_err = NULL;
- }
- }
- g_strfreev(cur->data);
- }
- g_slist_free(largv);
- return exit_code;
-}
-
-static gint
-execute_command(const VC_RECORD * vc, gchar ** std_out, gchar ** std_err, const gchar * filename,
- gint cmd, GSList * list, const gchar * message)
-{
- gchar *dir;
- gint ret;
-
- if (std_out)
- *std_out = NULL;
- if (std_err)
- *std_err = NULL;
-
- if (vc->commands[cmd].function)
- {
- return vc->commands[cmd].function(std_out, std_err, filename, list, message);
- }
-
- if (vc->commands[cmd].startdir == VC_COMMAND_STARTDIR_FILE)
- {
- if (g_file_test(filename, G_FILE_TEST_IS_DIR))
- dir = g_strdup(filename);
- else
- dir = g_path_get_dirname(filename);
- }
- else if (vc->commands[cmd].startdir == VC_COMMAND_STARTDIR_BASE)
- {
- dir = vc->get_base_dir(filename);
- }
- else
- {
- g_warning("geanyvc: unknown startdir type: %d", vc->commands[cmd].startdir);
- }
-
- ret = execute_custom_command(dir, vc->commands[cmd].command, vc->commands[cmd].env, std_out,
- std_err, filename, list, message);
- g_free(dir);
- return ret;
-}
-
-/* Callback if menu item for a single file was activated */
-static void
-vcdiff_file_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
-{
- gchar *text = NULL;
- gchar *new, *old;
- gchar *name;
- gchar *localename;
- const VC_RECORD *vc;
- GeanyDocument *doc;
-
- doc = document_get_current();
- g_return_if_fail(doc != NULL && doc->file_name != NULL);
-
- if (doc->changed)
- {
- document_save_file(doc, FALSE);
- }
-
- vc = find_vc(doc->file_name);
- g_return_if_fail(vc);
-
- execute_command(vc, &text, NULL, doc->file_name, VC_COMMAND_DIFF_FILE, NULL, NULL);
- if (text)
- {
- if (set_external_diff && get_external_diff_viewer())
- {
- g_free(text);
-
- /* 1) rename file to file.geany.~NEW~
- 2) revert file
- 3) rename file to file.geanyvc.~BASE~
- 4) rename file.geany.~NEW~ to origin file
- 5) show diff
- */
- localename = utils_get_locale_from_utf8(doc->file_name);
-
- new = g_strconcat(doc->file_name, ".geanyvc.~NEW~", NULL);
- setptr(new, utils_get_locale_from_utf8(new));
-
- old = g_strconcat(doc->file_name, ".geanyvc.~BASE~", NULL);
- setptr(old, utils_get_locale_from_utf8(old));
-
- if (g_rename(localename, new) != 0)
- {
- g_warning(_
- ("geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'"),
- localename, new);
- goto end;
- }
-
- execute_command(vc, NULL, NULL, doc->file_name,
- VC_COMMAND_REVERT_FILE, NULL, NULL);
-
- if (g_rename(localename, old) != 0)
- {
- g_warning(_
- ("geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'"),
- localename, old);
- g_rename(new, localename);
- goto end;
- }
- g_rename(new, localename);
-
- vc_external_diff(old, localename);
- g_unlink(old);
- end:
- g_free(old);
- g_free(new);
- g_free(localename);
- return;
- }
- else
- {
- name = g_strconcat(doc->file_name, ".vc.diff", NULL);
- show_output(text, name, doc->encoding, NULL);
- g_free(text);
- g_free(name);
- }
-
- }
- else
- {
- ui_set_statusbar(FALSE, _("No changes were made."));
- }
-}
-
-
-
-/* Callback if menu item for the base directory was activated */
-static void
-vcdiff_dir_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, gpointer data)
-{
- gchar *text = NULL;
- gchar *dir;
- gint flags = GPOINTER_TO_INT(data);
- const VC_RECORD *vc;
- GeanyDocument *doc;
-
- doc = document_get_current();
- g_return_if_fail(doc != NULL && doc->file_name != NULL);
-
- if (doc && doc->changed && doc->file_name != NULL)
- {
- document_save_file(doc, FALSE);
- }
-
- vc = find_vc(doc->file_name);
- g_return_if_fail(vc);
-
- if (flags & FLAG_BASEDIR)
- {
- dir = vc->get_base_dir(doc->file_name);
- }
- else if (flags & FLAG_DIR)
- {
- dir = g_path_get_dirname(doc->file_name);
- }
- else
- return;
- g_return_if_fail(dir);
-
- execute_command(vc, &text, NULL, dir, VC_COMMAND_DIFF_DIR, NULL, NULL);
- if (text)
- {
- gchar *name;
- name = g_strconcat(dir, ".vc.diff", NULL);
- show_output(text, name, doc->encoding, NULL);
- g_free(text);
- g_free(name);
- }
- else
- {
- ui_set_statusbar(FALSE, _("No changes were made."));
- }
- g_free(dir);
-}
-
-static void
-vcblame_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
-{
- gchar *text = NULL;
- const VC_RECORD *vc;
- GeanyDocument *doc;
-
- doc = document_get_current();
- g_return_if_fail(doc != NULL && doc->file_name != NULL);
-
- vc = find_vc(doc->file_name);
- g_return_if_fail(vc);
-
- execute_command(vc, &text, NULL, doc->file_name, VC_COMMAND_BLAME, NULL, NULL);
- if (text)
- {
- show_output(text, "*VC-BLAME*", NULL, doc->file_type);
- g_free(text);
- }
- else
- {
- ui_set_statusbar(FALSE, _("No history avaible"));
- }
-}
-
-
-static void
-vclog_file_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
-{
- gchar *output = NULL;
- const VC_RECORD *vc;
- GeanyDocument *doc;
-
- doc = document_get_current();
- g_return_if_fail(doc != NULL && doc->file_name != NULL);
-
- vc = find_vc(doc->file_name);
- g_return_if_fail(vc);
-
- execute_command(vc, &output, NULL, doc->file_name, VC_COMMAND_LOG_FILE, NULL, NULL);
- if (output)
- {
- show_output(output, "*VC-LOG*", NULL, NULL);
- g_free(output);
- }
-}
-
-static void
-vclog_dir_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
-{
- gchar *base_name = NULL;
- gchar *text = NULL;
- const VC_RECORD *vc;
- GeanyDocument *doc;
-
- doc = document_get_current();
- g_return_if_fail(doc != NULL && doc->file_name != NULL);
-
- base_name = g_path_get_dirname(doc->file_name);
-
- vc = find_vc(base_name);
- g_return_if_fail(vc);
-
- execute_command(vc, &text, NULL, base_name, VC_COMMAND_LOG_DIR, NULL, NULL);
- if (text)
- {
- show_output(text, "*VC-LOG*", NULL, NULL);
- g_free(text);
- }
-
- g_free(base_name);
-}
-
-static void
-vclog_basedir_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
-{
- gchar *text = NULL;
- const VC_RECORD *vc;
- GeanyDocument *doc;
- gchar *basedir;
-
- doc = document_get_current();
- g_return_if_fail(doc != NULL && doc->file_name != NULL);
-
- vc = find_vc(doc->file_name);
- g_return_if_fail(vc);
-
- basedir = vc->get_base_dir(doc->file_name);
- g_return_if_fail(basedir);
-
- execute_command(vc, &text, NULL, basedir, VC_COMMAND_LOG_DIR, NULL, NULL);
- if (text)
- {
- show_output(text, "*VC-LOG*", NULL, NULL);
- g_free(text);
- }
- g_free(basedir);
-}
-
-/* Show status from the current directory */
-static void
-vcstatus_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
-{
- gchar *base_name = NULL;
- gchar *text = NULL;
- const VC_RECORD *vc;
- GeanyDocument *doc;
-
- doc = document_get_current();
- g_return_if_fail(doc != NULL && doc->file_name != NULL);
-
- if (doc->changed)
- {
- document_save_file(doc, FALSE);
- }
-
- base_name = g_path_get_dirname(doc->file_name);
-
- vc = find_vc(base_name);
- g_return_if_fail(vc);
-
- execute_command(vc, &text, NULL, base_name, VC_COMMAND_STATUS, NULL, NULL);
- if (text)
- {
- show_output(text, "*VC-STATUS*", NULL, NULL);
- g_free(text);
- }
-
- g_free(base_name);
-}
-
-static void
-vcshow_file_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
-{
- gchar *output = NULL;
- const VC_RECORD *vc;
- GeanyDocument *doc;
-
- doc = document_get_current();
- g_return_if_fail(doc != NULL && doc->file_name != NULL);
-
- vc = find_vc(doc->file_name);
- g_return_if_fail(vc);
-
- execute_command(vc, &output, NULL, doc->file_name, VC_COMMAND_SHOW, NULL, NULL);
- if (output)
- {
- gchar *name;
- name = g_strconcat(doc->file_name, ".vc.orig", NULL);
- show_output(output, name, doc->encoding, doc->file_type);
- g_free(name);
- g_free(output);
- }
-}
-
-static gboolean
-command_with_question_activated(gchar ** text, gint cmd, const gchar * question, gint flags)
-{
- GtkWidget *dialog;
- gint result;
- gchar *dir;
- const VC_RECORD *vc;
- GeanyDocument *doc;
-
- doc = document_get_current();
- g_return_val_if_fail(doc != NULL && doc->file_name != NULL, FALSE);
-
- dir = g_path_get_dirname(doc->file_name);
- vc = find_vc(dir);
- g_return_val_if_fail(vc, FALSE);
-
- if (flags & FLAG_BASEDIR)
- {
- dir = vc->get_base_dir(dir);
- }
-
- if (doc->changed)
- {
- document_save_file(doc, FALSE);
- }
-
- if ((flags & FLAG_FORCE_ASK) || set_add_confirmation)
- {
- dialog = gtk_message_dialog_new(GTK_WINDOW(geany->main_widgets->window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_YES_NO, question,
- (flags & (FLAG_DIR | FLAG_BASEDIR) ? dir :
- doc->file_name));
- result = gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
- }
- else
- {
- result = GTK_RESPONSE_YES;
- }
-
- if (result == GTK_RESPONSE_YES)
- {
- if (flags & FLAG_FILE)
- execute_command(vc, text, NULL, doc->file_name, cmd, NULL, NULL);
- if (flags & (FLAG_DIR | FLAG_BASEDIR))
- execute_command(vc, text, NULL, dir, cmd, NULL, NULL);
- if (flags & FLAG_RELOAD)
- document_reload_file(doc, NULL);
- }
- g_free(dir);
- return (result == GTK_RESPONSE_YES);
-}
-
-static void
-vcrevert_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
-{
- command_with_question_activated(NULL, VC_COMMAND_REVERT_FILE,
- _("Do you really want to revert: %s?"),
- FLAG_RELOAD | FLAG_FILE | FLAG_FORCE_ASK);
-}
-
-static void
-vcrevert_dir_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, gint flags)
-{
- command_with_question_activated(NULL, VC_COMMAND_REVERT_DIR,
- _("Do you really want to revert: %s?"),
- FLAG_RELOAD | flags | FLAG_FORCE_ASK);
-}
-
-static void
-vcadd_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
-{
- command_with_question_activated(NULL, VC_COMMAND_ADD,
- _("Do you really want to add: %s?"), FLAG_FILE);
-}
-
-static void
-vcremove_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
-{
- if (command_with_question_activated(NULL, VC_COMMAND_REMOVE,
- _("Do you really want to remove: %s?"),
- FLAG_FORCE_ASK | FLAG_FILE))
- {
- document_remove_page(gtk_notebook_get_current_page
- (GTK_NOTEBOOK(geany->main_widgets->notebook)));
- }
-}
-
-static void
-vcupdate_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata)
-{
- gchar *text = NULL;
- GeanyDocument *doc;
-
- doc = document_get_current();
- g_return_if_fail(doc != NULL && doc->file_name != NULL);
-
- if (doc->changed)
- {
- document_save_file(doc, FALSE);
- }
-
- if (command_with_question_activated(&text, VC_COMMAND_UPDATE,
- _("Do you really want to update?"), FLAG_BASEDIR))
- {
- document_reload_file(doc, NULL);
-
- if (NZV(text))
- show_output(text, "*VC-UPDATE*", NULL, NULL);
- g_free(text);
- }
-}
-
-enum
-{
- COLUMN_COMMIT,
- COLUMN_STATUS,
- COLUMN_PATH,
- NUM_COLUMNS
-};
-
-static GtkTreeModel *
-create_commit_model(const GSList * commit)
-{
- GtkListStore *store;
- GtkTreeIter iter;
- const GSList *cur;
-
- /* create list store */
- store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING);
-
- /* add data to the list store */
-
- for (cur = commit; cur != NULL; cur = g_slist_next(cur))
- {
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
- COLUMN_COMMIT, TRUE,
- COLUMN_STATUS, ((CommitItem *) (cur->data))->status,
- COLUMN_PATH, ((CommitItem *) (cur->data))->path, -1);
- }
-
- return GTK_TREE_MODEL(store);
-}
-
-static gboolean
-get_commit_files_foreach(GtkTreeModel * model, G_GNUC_UNUSED GtkTreePath * path, GtkTreeIter * iter,
- gpointer data)
-{
- GSList **files = (GSList **) data;
- gboolean commit;
- gchar *filename;
-
- gtk_tree_model_get(model, iter, COLUMN_COMMIT, &commit, -1);
- if (!commit)
- return FALSE;
-
- gtk_tree_model_get(model, iter, COLUMN_PATH, &filename, -1);
- *files = g_slist_prepend(*files, filename);
- return FALSE;
-}
-
-static gboolean
-get_commit_diff_foreach(GtkTreeModel * model, G_GNUC_UNUSED GtkTreePath * path, GtkTreeIter * iter,
- gpointer data)
-{
- GString *diff = data;
- gboolean commit;
- gchar *filename;
- gchar *tmp = NULL;
- gchar *status;
- const VC_RECORD *vc;
-
- gtk_tree_model_get(model, iter, COLUMN_COMMIT, &commit, -1);
- if (!commit)
- return FALSE;
-
- gtk_tree_model_get(model, iter, COLUMN_STATUS, &status, -1);
-
- if (! utils_str_equal(status, FILE_STATUS_MODIFIED))
- {
- g_free(status);
- return FALSE;
- }
-
- gtk_tree_model_get(model, iter, COLUMN_PATH, &filename, -1);
-
- vc = find_vc(filename);
- g_return_val_if_fail(vc, FALSE);
-
- execute_command(vc, &tmp, NULL, filename, VC_COMMAND_DIFF_FILE, NULL, NULL);
- if (tmp)
- {
- /* We temporarily add the filename to the diff output for parsing the diff output later,
- * after we have finished parsing, we apply the tag "invisible" which hides the text. */
- g_string_append_printf(diff, "VC_DIFF%s\n", filename);
- g_string_append(diff, tmp);
- g_free(tmp);
- }
- else
- {
- g_warning("error: geanyvc: get_commit_diff_foreach: empty diff output");
- }
- g_free(filename);
- return FALSE;
-}
-
-static gchar *
-get_commit_diff(GtkTreeView * treeview)
-{
- GtkTreeModel *model = gtk_tree_view_get_model(treeview);
- GString *ret = g_string_new(NULL);
-
- gtk_tree_model_foreach(model, get_commit_diff_foreach, ret);
-
- return g_string_free(ret, FALSE);
-}
-
-static void
-set_diff_buff(GtkTextBuffer * buffer, const gchar * txt)
-{
- GtkTextIter start, end;
- GtkTextMark *mark;
- gchar *filename;
- const gchar *tagname = "";
- const gchar *c, *p = txt;
-
- gtk_text_buffer_set_text(buffer, txt, -1);
-
- gtk_text_buffer_get_start_iter(buffer, &start);
- gtk_text_buffer_get_end_iter(buffer, &end);
-
- gtk_text_buffer_remove_all_tags(buffer, &start, &end);
-
- while (p)
- {
- c = NULL;
- if (*p == '-')
- {
- tagname = "deleted";
- }
- else if (*p == '+')
- {
- tagname = "added";
- }
- else if (*p == ' ')
- {
- tagname = "";
- }
- else if (strncmp(p, "VC_DIFF", 7) == 0)
- { /* Lines starting with VC_DIFF are special and were added by our code to tell about
- * filename to which the following diff lines belong. We use this file to create
- * text marks which we then later use to scroll to if the corresponding file has been
- * selected in the commit dialog's files list. */
- tagname = "invisible";
- c = strchr(p + 7, '\n');
- }
- else
- {
- tagname = "default";
- }
- gtk_text_buffer_get_iter_at_offset(buffer, &start,
- g_utf8_pointer_to_offset(txt, p));
-
- if (c)
- { /* create the mark *after* the start iter has been updated */
- filename = g_strndup(p + 7, c - p - 7);
- /* delete old text marks */
- mark = gtk_text_buffer_get_mark(buffer, filename);
- if (mark)
- gtk_text_buffer_delete_mark(buffer, mark);
- /* create a new one */
- gtk_text_buffer_create_mark(buffer, filename, &start, TRUE);
- g_free(filename);
- }
-
- p = strchr(p, '\n');
- if (p)
- {
- if (*tagname)
- {
- gtk_text_buffer_get_iter_at_offset(buffer, &end,
- g_utf8_pointer_to_offset(txt, p + 1));
- gtk_text_buffer_apply_tag_by_name(buffer, tagname, &start, &end);
- }
- p++;
- }
- }
-}
-
-static void
-refresh_diff_view(GtkTreeView *treeview)
-{
- gchar *diff;
- GtkWidget *diffView = ui_lookup_widget(GTK_WIDGET(treeview), "textDiff");
- diff = get_commit_diff(GTK_TREE_VIEW(treeview));
- set_diff_buff(gtk_text_view_get_buffer(GTK_TEXT_VIEW(diffView)), diff);
- g_free(diff);
-}
-
-static void
-commit_toggled(G_GNUC_UNUSED GtkCellRendererToggle * cell, gchar * path_str, gpointer data)
-{
- GtkTreeView *treeview = GTK_TREE_VIEW(data);
- GtkTreeModel *model = gtk_tree_view_get_model(treeview);
- GtkTreeIter iter;
- GtkTreePath *path = gtk_tree_path_new_from_string(path_str);
- gboolean fixed;
- gchar *filename;
- GtkTextView *diffView = GTK_TEXT_VIEW(ui_lookup_widget(GTK_WIDGET(treeview), "textDiff"));
- GtkTextMark *mark;
-
- /* get toggled iter */
- gtk_tree_model_get_iter(model, &iter, path);
- gtk_tree_model_get(model, &iter, COLUMN_COMMIT, &fixed, COLUMN_PATH, &filename, -1);
-
- /* do something with the value */
- fixed ^= 1;
-
- /* set new value */
- gtk_list_store_set(GTK_LIST_STORE(model), &iter, COLUMN_COMMIT, fixed, -1);
-
- if (! fixed)
- {
- mark = gtk_text_buffer_get_mark(gtk_text_view_get_buffer(diffView), filename);
- if (mark)
- gtk_text_buffer_delete_mark(gtk_text_view_get_buffer(diffView), mark);
- }
-
- refresh_diff_view(treeview);
-
- /* clean up */
- gtk_tree_path_free(path);
- g_free(filename);
-}
-
-static gboolean
-toggle_all_commit_files (GtkTreeModel *model, GtkTreePath *path,
- GtkTreeIter *iter, gpointer data)
-{
- (void)path;
- gtk_list_store_set(GTK_LIST_STORE(model), iter, COLUMN_COMMIT, *(gint*)data, -1);
- return FALSE;
-}
-
-static void
-commit_all_toggled_cb(GtkToggleButton *check_box, gpointer treeview)
-{
- GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
- gint toggled = gtk_toggle_button_get_active(check_box);
-
- gtk_tree_model_foreach(model, toggle_all_commit_files, &toggled);
-
- refresh_diff_view(treeview);
-}
-
-static void
-add_commit_columns(GtkTreeView * treeview)
-{
- GtkCellRenderer *renderer;
- GtkTreeViewColumn *column;
-
- /* column for fixed toggles */
- renderer = gtk_cell_renderer_toggle_new();
- g_signal_connect(renderer, "toggled", G_CALLBACK(commit_toggled), treeview);
-
- column = gtk_tree_view_column_new_with_attributes(_("Commit Y/N"),
- renderer, "active", COLUMN_COMMIT, NULL);
-
- /* set this column to a fixed sizing (of 80 pixels) */
- gtk_tree_view_column_set_sizing(GTK_TREE_VIEW_COLUMN(column), GTK_TREE_VIEW_COLUMN_FIXED);
- gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN(column), 80);
- gtk_tree_view_append_column(treeview, column);
-
- /* column for status */
- renderer = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes(_("Status"),
- renderer, "text", COLUMN_STATUS, NULL);
- gtk_tree_view_column_set_sort_column_id(column, COLUMN_STATUS);
- gtk_tree_view_append_column(treeview, column);
-
- /* column for path of file to commit */
- renderer = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes(_("Path"),
- renderer, "text", COLUMN_PATH, NULL);
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Plugins GTK 2.8 build test failed at: waf build
See http://nightly.geany.org/misc/build_gtk28_plugins_stderr.log for details.
Error messages:
../../gtk28_test_plugins/codenav/src/codenavigation.c: In function 'switch_menu_item_activate':
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: 'g_strcmp0' undeclared (first use in this function)
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: (Each undeclared identifier is reported only once
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
...
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
../../gtk28_test_plugins/codenav/src/codenavigation.c:251: warning: comparison between signed and unsigned
../../gtk28_test_plugins/codenav/src/codenavigation.c:260: warning: implicit declaration of function 'g_strcmp0'
../../gtk28_test_plugins/codenav/src/codenavigation.c:311: warning: ISO C90 forbids mixed declarations and code
Build failed
-> task failed (err #1):
{task: cc codenavigation.c -> codenavigation_2.o}
http://nightly.geany.org/
Plugins GTK 2.8 build test failed at: waf build
See http://nightly.geany.org/misc/build_gtk28_plugins_stderr.log for details.
Error messages:
../../gtk28_test_plugins/codenav/src/codenavigation.c: In function 'switch_menu_item_activate':
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: 'g_strcmp0' undeclared (first use in this function)
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: (Each undeclared identifier is reported only once
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
...
../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.)
../../gtk28_test_plugins/codenav/src/codenavigation.c:251: warning: comparison between signed and unsigned
../../gtk28_test_plugins/codenav/src/codenavigation.c:260: warning: implicit declaration of function 'g_strcmp0'
../../gtk28_test_plugins/codenav/src/codenavigation.c:311: warning: ISO C90 forbids mixed declarations and code
Build failed
-> task failed (err #1):
{task: cc codenavigation.c -> codenavigation_2.o}
http://nightly.geany.org/