[Monodevelop-patches-list] r2588 - in branches/MonoDevelop-plan-43: . lib src src/Core src/Plugins src/Plugins/CSharp src/Plugins/Content src/Plugins/Editor src/Plugins/Node src/Plugins/Workbench
Jeroen Zwartepoorte
jzwart at mono-cvs.ximian.com
Sun Jun 5 07:26:18 EDT 2005
Author: jzwart
Date: 2005-06-05 07:26:17 -0400 (Sun, 05 Jun 2005)
New Revision: 2588
Added:
branches/MonoDevelop-plan-43/AUTHORS
branches/MonoDevelop-plan-43/COPYING
branches/MonoDevelop-plan-43/INSTALL
branches/MonoDevelop-plan-43/MAINTAINERS
branches/MonoDevelop-plan-43/Makefile.am
branches/MonoDevelop-plan-43/NEWS
branches/MonoDevelop-plan-43/README
branches/MonoDevelop-plan-43/autogen.sh
branches/MonoDevelop-plan-43/configure.in
branches/MonoDevelop-plan-43/lib/Makefile.am
branches/MonoDevelop-plan-43/lib/MonoDevelop.Dock.dll
branches/MonoDevelop-plan-43/m4/
branches/MonoDevelop-plan-43/src/Core/Makefile.am
branches/MonoDevelop-plan-43/src/Makefile.am
branches/MonoDevelop-plan-43/src/Plugins/CSharp/Makefile.am
branches/MonoDevelop-plan-43/src/Plugins/Content/Makefile.am
branches/MonoDevelop-plan-43/src/Plugins/Editor/Makefile.am
branches/MonoDevelop-plan-43/src/Plugins/Makefile.am
branches/MonoDevelop-plan-43/src/Plugins/Node/Makefile.am
branches/MonoDevelop-plan-43/src/Plugins/Workbench/Makefile.am
Removed:
branches/MonoDevelop-plan-43/default.build
branches/MonoDevelop-plan-43/src/Core/core.build
branches/MonoDevelop-plan-43/src/Plugins/CSharp/csharp.build
branches/MonoDevelop-plan-43/src/Plugins/Content/content.build
branches/MonoDevelop-plan-43/src/Plugins/Editor/editor.build
branches/MonoDevelop-plan-43/src/Plugins/Node/node.build
branches/MonoDevelop-plan-43/src/Plugins/Workbench/workbench.build
branches/MonoDevelop-plan-43/src/Plugins/plugins.build
Modified:
branches/MonoDevelop-plan-43/
branches/MonoDevelop-plan-43/ChangeLog
branches/MonoDevelop-plan-43/lib/
branches/MonoDevelop-plan-43/src/
branches/MonoDevelop-plan-43/src/Core/
branches/MonoDevelop-plan-43/src/Core/monodevelop.exe.config.in
branches/MonoDevelop-plan-43/src/Core/monodevelop.in
branches/MonoDevelop-plan-43/src/Plugins/
branches/MonoDevelop-plan-43/src/Plugins/CSharp/
branches/MonoDevelop-plan-43/src/Plugins/CSharp/CSharpFileNode.cs
branches/MonoDevelop-plan-43/src/Plugins/CSharp/CSharpNodeViewerFactory.cs
branches/MonoDevelop-plan-43/src/Plugins/Content/
branches/MonoDevelop-plan-43/src/Plugins/Content/ContentManager.cs
branches/MonoDevelop-plan-43/src/Plugins/Content/ContentManagerWidgetFactory.cs
branches/MonoDevelop-plan-43/src/Plugins/Content/Context.cs
branches/MonoDevelop-plan-43/src/Plugins/Content/INodeViewerFactory.cs
branches/MonoDevelop-plan-43/src/Plugins/Editor/
branches/MonoDevelop-plan-43/src/Plugins/Editor/TextNodeViewerFactory.cs
branches/MonoDevelop-plan-43/src/Plugins/Node/
branches/MonoDevelop-plan-43/src/Plugins/Workbench/
branches/MonoDevelop-plan-43/src/Plugins/Workbench/Workbench.cs
Log:
2005-06-05 Jeroen Zwartepoorte <jeroen.zwartepoorte at gmail.com>
* autotoolify project.
Property changes on: branches/MonoDevelop-plan-43
___________________________________________________________________
Name: svn:ignore
- build
+ Makefile
Makefile.in
aclocal.m4
autom4te.cache
config.*
configure
install-sh
intltool*
libtool
ltmain.sh
missing
mkinstalldirs
stamp-h1
Added: branches/MonoDevelop-plan-43/AUTHORS
===================================================================
--- branches/MonoDevelop-plan-43/AUTHORS 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/AUTHORS 2005-06-05 11:26:17 UTC (rev 2588)
@@ -0,0 +1 @@
+Jeroen Zwartepoorte <jeroen at xs4all.nl>
Added: branches/MonoDevelop-plan-43/COPYING
===================================================================
--- branches/MonoDevelop-plan-43/COPYING 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/COPYING 2005-06-05 11:26:17 UTC (rev 2588)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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.
Modified: branches/MonoDevelop-plan-43/ChangeLog
===================================================================
--- branches/MonoDevelop-plan-43/ChangeLog 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/ChangeLog 2005-06-05 11:26:17 UTC (rev 2588)
@@ -1,3 +1,7 @@
+2005-06-05 Jeroen Zwartepoorte <jeroen.zwartepoorte at gmail.com>
+
+ * autotoolify project.
+
2004-08-17 Jeroen Zwartepoorte <jeroen at xs4all.nl>
* src/Plugins/Node/ReadOnlyException: custom IOException used in Buffer.
Added: branches/MonoDevelop-plan-43/INSTALL
===================================================================
--- branches/MonoDevelop-plan-43/INSTALL 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/INSTALL 2005-06-05 11:26:17 UTC (rev 2588)
@@ -0,0 +1,229 @@
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ These are generic installation instructions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
+
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory. After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+ By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc. You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the `--target=TYPE' option to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
Added: branches/MonoDevelop-plan-43/MAINTAINERS
===================================================================
--- branches/MonoDevelop-plan-43/MAINTAINERS 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/MAINTAINERS 2005-06-05 11:26:17 UTC (rev 2588)
@@ -0,0 +1 @@
+Jeroen Zwartepoorte <jeroen at xs4all.nl>
Added: branches/MonoDevelop-plan-43/Makefile.am
===================================================================
--- branches/MonoDevelop-plan-43/Makefile.am 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/Makefile.am 2005-06-05 11:26:17 UTC (rev 2588)
@@ -0,0 +1,6 @@
+SUBDIRS = lib src
+
+DISTCLEANFILES = \
+ intltool-extract \
+ intltool-merge \
+ intltool-update
Added: branches/MonoDevelop-plan-43/NEWS
===================================================================
Added: branches/MonoDevelop-plan-43/README
===================================================================
Added: branches/MonoDevelop-plan-43/autogen.sh
===================================================================
--- branches/MonoDevelop-plan-43/autogen.sh 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/autogen.sh 2005-06-05 11:26:17 UTC (rev 2588)
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="monodevelop"
+
+(test -f $srcdir/configure.in) || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level $PKG_NAME directory"
+ exit 1
+}
+
+which gnome-autogen.sh || {
+ echo "You need to install gnome-common from the GNOME CVS"
+ exit 1
+}
+REQUIRED_AUTOMAKE_VERSION=1.7 USE_GNOME2_MACROS=1 ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $srcdir/m4" . gnome-autogen.sh
Property changes on: branches/MonoDevelop-plan-43/autogen.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/MonoDevelop-plan-43/configure.in
===================================================================
--- branches/MonoDevelop-plan-43/configure.in 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/configure.in 2005-06-05 11:26:17 UTC (rev 2588)
@@ -0,0 +1,99 @@
+AC_INIT(src/Core/MonoDevelop.cs)
+
+AM_CONFIG_HEADER(config.h)
+
+AM_INIT_AUTOMAKE(monodevelop, 0.0.1)
+
+AM_MAINTAINER_MODE
+
+AC_PROG_INTLTOOL([0.21])
+
+AC_PROG_CC
+AC_ISC_POSIX
+AC_HEADER_STDC
+AM_PROG_LIBTOOL
+
+GNOME_DEBUG_CHECK
+GNOME_COMPILE_WARNINGS(error)
+AM_PATH_GLIB_2_0
+
+dnl Version dependencies
+
+GTK_REQUIRED=2.6
+MONO_REQUIRED=1.1.7
+GTKSHARP_REQUIRED=2.5
+GTKSOURCEVIEW_REQUIRED=0.10
+
+dnl Pkgconfig
+PKG_CHECK_MODULES(MD,
+ gconf-2.0 \
+ gdk-pixbuf-2.0 \
+ gnome-vfs-2.0 \
+ gtk+-2.0 >= $GTK_REQUIRED \
+ gnome-icon-theme)
+AC_SUBST(MD_CFLAGS)
+AC_SUBST(MD_LIBS)
+
+PKG_CHECK_MODULES(MONO,
+ mono >= $MONO_REQUIRED)
+
+PKG_CHECK_MODULES(GTKSHARP,
+ gtk-sharp-2.0 >= $GTKSHARP_REQUIRED \
+ gnome-sharp-2.0 >= $GTKSHARP_REQUIRED \
+ glade-sharp-2.0 >= $GTKSHARP_REQUIRED \
+ gconf-sharp-2.0 >= $GTKSHARP_REQUIRED \
+ gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED)
+AC_SUBST(GTKSHARP_LIBS)
+
+PKG_CHECK_MODULES(GTKSOURCEVIEWSHARP,
+ gtksourceview-sharp-2.0 >= $GTKSOURCEVIEW_REQUIRED)
+AC_SUBST(GTKSOURCEVIEWSHARP_LIBS)
+
+dnl Handle GConf
+AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+AM_GCONF_SOURCE_2
+
+dnl Check for Mono
+AC_PATH_PROG(MCS, mcs)
+AC_PATH_PROG(MONO, mono)
+
+MCS_FLAGS="-codepage:utf8 -g"
+MONO_FLAGS=
+if test $USE_MAINTAINER_MODE = yes; then
+ MCS_FLAGS="$MCS_FLAGS -g"
+ MONO_FLAGS="$MONO_FLAGS --debug"
+fi
+AC_SUBST(MCS_FLAGS)
+AC_SUBST(MONO_FLAGS)
+
+plugindir='$(prefix)/lib/monodevelop/plugins'
+AC_SUBST(plugindir)
+
+dnl GAC
+AC_PATH_PROG(GACUTIL, gacutil)
+if test x$GACUTIL = x; then
+ AC_MSG_ERROR(You need gacutil)
+fi
+
+GACUTIL_FLAGS='/package muine /gacdir $(libdir) /root $(DESTDIR)$(libdir)'
+AC_SUBST(GACUTIL_FLAGS)
+
+dnl Intl
+ALL_LINGUAS=""
+GETTEXT_PACKAGE=mm
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
+AM_GLIB_GNU_GETTEXT
+
+AC_OUTPUT([
+Makefile
+lib/Makefile
+src/Makefile
+src/Core/Makefile
+src/Plugins/Makefile
+src/Plugins/Node/Makefile
+src/Plugins/Workbench/Makefile
+src/Plugins/Content/Makefile
+src/Plugins/Editor/Makefile
+src/Plugins/CSharp/Makefile
+])
Deleted: branches/MonoDevelop-plan-43/default.build
===================================================================
--- branches/MonoDevelop-plan-43/default.build 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/default.build 2005-06-05 11:26:17 UTC (rev 2588)
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-<project name="monodevelop" default="build">
- <!-- global project settings -->
- <property name="basedir" value="${project::get-base-directory()}"/>
- <property name="project.name" value="monodevelop"/>
- <property name="project.version" value="0.1" overwrite="false"/>
- <!-- global build settings -->
- <property name="build.debug" value="true"/>
- <property name="build.dir" value="${path::combine(basedir, 'build')}"/>
- <property name="bin.dir" value="${path::combine(build.dir, 'bin')}"/>
- <property name="lib.dir" value="${path::combine(build.dir, 'lib')}"/>
- <property name="share.dir" value="${path::combine(build.dir, 'share/monodevelop')}"/>
- <!-- dependency versions -->
- <property name="gtk-sharp.version" value="1.2.99"/>
- <property name="gnome-vfs-sharp.version" value="1.2.99"/>
- <property name="gnome-sharp.version" value="1.2.99"/>
- <property name="glade-sharp.version" value="1.2.99"/>
- <property name="gtksourceview-sharp.version" value="0.3"/>
-
- <!-- check for pkg-config dependencies and initialize properties -->
- <target name="init" description="initializes build properties">
- <!-- check for gtk-sharp-2.0 -->
- <if test="${pkg-config::exists('gtk-sharp-2.0')}">
- <if test="${pkg-config::is-atleast-version('gtk-sharp-2.0', gtk-sharp.version)}">
- <property name="gtk-sharp.libs" value="${pkg-config::get-link-flags('gtk-sharp-2.0')}"/>
- </if>
- </if>
- <!-- check for gnome-vfs-sharp-2.0 -->
- <if test="${pkg-config::exists('gnome-vfs-sharp-2.0')}">
- <if test="${pkg-config::is-atleast-version('gnome-vfs-sharp-2.0', gnome-vfs-sharp.version)}">
- <property name="gnome-vfs-sharp.libs" value="${pkg-config::get-link-flags('gnome-vfs-sharp-2.0')}"/>
- </if>
- </if>
- <!-- check for gnome-sharp -->
- <if test="${pkg-config::exists('gnome-sharp-2.0')}">
- <if test="${pkg-config::is-atleast-version('gnome-sharp-2.0', gnome-sharp.version)}">
- <property name="gnome-sharp.libs" value="${pkg-config::get-link-flags('gnome-sharp-2.0')}"/>
- </if>
- </if>
- <!-- check for glade-sharp -->
- <if test="${pkg-config::exists('glade-sharp-2.0')}">
- <if test="${pkg-config::is-atleast-version('glade-sharp-2.0', glade-sharp.version)}">
- <property name="glade-sharp.libs" value="${pkg-config::get-link-flags('glade-sharp-2.0')}"/>
- </if>
- </if>
- <!-- check for gtksourceview-sharp -->
- <if test="${pkg-config::exists('gtksourceview-sharp')}">
- <if test="${pkg-config::is-atleast-version('gtksourceview-sharp', gtksourceview-sharp.version)}">
- <property name="gtksourceview-sharp.libs" value="${pkg-config::get-link-flags('gtksourceview-sharp')}"/>
- </if>
- </if>
-
- <!-- output a message about required dependencies if not all dependencies exist -->
- <if test="${not(property::exists('gtk-sharp.libs'))}">
- <call target="dependencies"/>
- <fail message="gtk-sharp dependency not found"/>
- </if>
- <if test="${not(property::exists('gnome-vfs-sharp.libs'))}">
- <call target="dependencies"/>
- <fail message="gnome-vfs-sharp dependency not found"/>
- </if>
- <if test="${not(property::exists('gnome-sharp.libs'))}">
- <call target="dependencies"/>
- <fail message="gnome-sharp dependency not found"/>
- </if>
- <if test="${not(property::exists('glade-sharp.libs'))}">
- <call target="dependencies"/>
- <fail message="glade-sharp dependency not found"/>
- </if>
- <if test="${not(property::exists('gtksourceview-sharp.libs'))}">
- <call target="dependencies"/>
- <fail message="gtksourceview-sharp dependency not found"/>
- </if>
-
- <!-- create directories -->
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${bin.dir}"/>
- <mkdir dir="${lib.dir}"/>
- <mkdir dir="${share.dir}"/>
-
- <!-- copy log4net.dll to lib.dir -->
- <copy file="${path::combine('lib', 'log4net.dll')}" todir="${lib.dir}"/>
- </target>
-
- <!-- output a list of required dependencies -->
- <target name="dependencies" description="outputs a list of required dependencies">
- <echo message="MonoDevelop requires the following dependencies:"/>
- <echo message=" gtk-sharp-2.0 >= ${gtk-sharp.version}"/>
- <echo message=" gnome-vfs-sharp-2.0 >= ${gnome-vfs-sharp.version}"/>
- <echo message=" gnome-sharp-2.0 >= ${gnome-sharp.version}"/>
- <echo message=" glade-sharp-2.0 >= ${glade-sharp.version}"/>
- <echo message=" gtksourceview-sharp >= ${gtksourceview-sharp.version}"/>
- <echo message=""/>
- <echo message="Install these packages first before building MonoDevelop"/>
- </target>
-
- <!-- cleanup build files -->
- <target name="clean" description="remove all files created by the build task">
- <!-- clean up plugin build files -->
- <nant buildfile="src/Plugins/plugins.build" target="clean" failonerror="false"/>
- <!-- clean up monodevelop build files -->
- <nant buildfile="src/Core/core.build" target="clean" failonerror="false"/>
- <!-- clean up library build files -->
- <nant buildfile="src/Libraries/libraries.build" target="clean" failonerror="false"/>
- <!-- remove the build directory -->
- <delete dir="${build.dir}" failonerror="false"/>
- </target>
-
- <!-- build the project -->
- <target name="build" depends="init" description="compiles the source code">
- <!-- build monodevelop.exe -->
- <nant buildfile="src/Core/core.build" target="build"/>
- <!-- build the libraries -->
- <nant buildfile="src/Libraries/libraries.build" target="build"/>
- <!-- build the plugins -->
- <nant buildfile="src/Plugins/plugins.build" target="build"/>
- </target>
-
- <!-- run MonoDevelop -->
- <target name="run" depends="build" description="run the program">
- <exec program="mono" commandline="${path::combine(bin.dir, 'monodevelop.exe')}" workingdir="${bin.dir}"/>
- </target>
-</project>
Property changes on: branches/MonoDevelop-plan-43/lib
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Added: branches/MonoDevelop-plan-43/lib/Makefile.am
===================================================================
--- branches/MonoDevelop-plan-43/lib/Makefile.am 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/lib/Makefile.am 2005-06-05 11:26:17 UTC (rev 2588)
@@ -0,0 +1,9 @@
+MONODEVELOP_LIBS = \
+ log4net.dll \
+ MonoDevelop.Dock.dll
+
+monodeveloplibdir = $(pkglibdir)
+monodeveloplib_DATA = $(MONODEVELOP_LIBS)
+
+EXTRA_DIST = \
+ $(MONODEVELOP_LIBS)
Added: branches/MonoDevelop-plan-43/lib/MonoDevelop.Dock.dll
===================================================================
(Binary files differ)
Property changes on: branches/MonoDevelop-plan-43/lib/MonoDevelop.Dock.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: branches/MonoDevelop-plan-43/src
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Property changes on: branches/MonoDevelop-plan-43/src/Core
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
monodevelop
monodevelop.exe
monodevelop.exe.mdb
monodevelop.exe.config
Added: branches/MonoDevelop-plan-43/src/Core/Makefile.am
===================================================================
--- branches/MonoDevelop-plan-43/src/Core/Makefile.am 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Core/Makefile.am 2005-06-05 11:26:17 UTC (rev 2588)
@@ -0,0 +1,46 @@
+CSC = $(MCS) $(MCS_FLAGS) $(CSFLAGS)
+
+TARGET = monodevelop.exe
+WRAPPER = monodevelop
+
+MONODEVELOP_CSFILES = \
+ AssemblyInfo.cs \
+ ICommand.cs \
+ MonoDevelop.cs
+
+MONODEVELOP_ASSEMBLIES = \
+ -r:$(top_builddir)/lib/log4net.dll \
+ $(GTKSHARP_LIBS)
+
+$(WRAPPER): $(srcdir)/$(WRAPPER).in
+ sed -e "s|\@prefix\@|$(prefix)|g" \
+ -e "s|\@pkglibdir\@|$(pkglibdir)|g" \
+ -e "s|\@target\@|$(TARGET)|g" \
+ -e "s|\@mono\@|$(MONO)|g" \
+ -e "s|\@mono_flags\@|$(MONO_FLAGS)|g" \
+ < $^ > $@
+
+$(TARGET).config: $(srcdir)/$(TARGET).config.in
+ sed -e "s|\@pkglibdir\@|$(pkglibdir)|g" \
+ -e "s|\@plugindir\@|$(plugindir)|g" \
+ < $^ > $@
+
+$(TARGET): $(MONODEVELOP_CSFILES)
+ $(CSC) -out:$@ $(MONODEVELOP_CSFILES) $(MONODEVELOP_ASSEMBLIES)
+
+all: $(TARGET)
+
+monodeveloplibdir = $(pkglibdir)
+monodeveloplib_DATA = $(TARGET) $(TARGET).config
+
+bin_SCRIPTS = $(WRAPPER)
+
+EXTRA_DIST = \
+ $(MONODEVELOP_CSFILES) \
+ $(WRAPPER).in \
+ $(TARGET).config.in
+
+CLEANFILES = \
+ $(TARGET) \
+ $(TARGET).config \
+ $(WRAPPER)
Deleted: branches/MonoDevelop-plan-43/src/Core/core.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Core/core.build 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Core/core.build 2005-06-05 11:26:17 UTC (rev 2588)
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<project name="core" default="build">
- <target name="build" description="compiles the source code">
- <!-- build monodevelop.exe -->
- <csc target="exe" output="${path::combine(bin.dir, 'monodevelop.exe')}" debug="${build.debug}">
- <sources>
- <include name="*.cs"/>
- </sources>
- <references basedir="${path::combine(basedir, 'lib')}">
- <include name="log4net.dll"/>
- </references>
- </csc>
-
- <!-- install the plugin file -->
- <copy file="monodevelop.exe.config.in" tofile="monodevelop.exe.config">
- <filterchain>
- <replacetokens>
- <token key="monodevelop_plugin_dir" value="${path::combine(lib.dir, 'monodevelop')}"/>
- <token key="monodevelop_ui_dir" value="${path::combine(share.dir, 'ui')}"/>
- </replacetokens>
- </filterchain>
- </copy>
- <move file="monodevelop.exe.config" todir="${bin.dir}" overwrite="true"/>
-
- <!-- install the monodevelop script -->
- <copy file="monodevelop.in" tofile="monodevelop">
- <filterchain encoding="ASCII">
- <replacetokens>
- <token key="bindir" value="${bin.dir}"/>
- <token key="libdir" value="${lib.dir}"/>
- <token key="monodir" value="${path::combine(pkg-config::get-variable('mono', 'prefix'), 'bin')}"/>
- </replacetokens>
- </filterchain>
- </copy>
- <!-- work around shortcoming of NAnt: no <chmod> task available atm -->
- <exec program="chmod" commandline="a+x monodevelop"/>
- <move file="monodevelop" todir="${bin.dir}" overwrite="true"/>
- </target>
-</project>
Modified: branches/MonoDevelop-plan-43/src/Core/monodevelop.exe.config.in
===================================================================
--- branches/MonoDevelop-plan-43/src/Core/monodevelop.exe.config.in 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Core/monodevelop.exe.config.in 2005-06-05 11:26:17 UTC (rev 2588)
@@ -2,7 +2,7 @@
<configuration>
<appSettings>
<add key="imagePath" value="@monodevelop_images_dir@"/>
- <add key="pluginPath" value="@monodevelop_plugin_dir@"/>
+ <add key="pluginPath" value="@plugindir@"/>
<add key="resourcePath" value="@monodevelop_resource_dir@"/>
<add key="uiPath" value="@monodevelop_ui_dir@"/>
</appSettings>
Modified: branches/MonoDevelop-plan-43/src/Core/monodevelop.in
===================================================================
--- branches/MonoDevelop-plan-43/src/Core/monodevelop.in 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Core/monodevelop.in 2005-06-05 11:26:17 UTC (rev 2588)
@@ -1,6 +1,6 @@
#!/bin/bash
-MONO_PATH=@libdir@
+MONO_PATH=@pkglibdir@
export MONO_PATH
- at monodir@/mono @bindir@/monodevelop.exe "$@"
+ at mono@ @mono_flags@ @pkglibdir@/@target@ "$@"
Added: branches/MonoDevelop-plan-43/src/Makefile.am
===================================================================
--- branches/MonoDevelop-plan-43/src/Makefile.am 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Makefile.am 2005-06-05 11:26:17 UTC (rev 2588)
@@ -0,0 +1 @@
+SUBDIRS = Core Plugins
Property changes on: branches/MonoDevelop-plan-43/src/Plugins
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Property changes on: branches/MonoDevelop-plan-43/src/Plugins/CSharp
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
csharp.dll
csharp.dll.mdb
csharp.plugin
Modified: branches/MonoDevelop-plan-43/src/Plugins/CSharp/CSharpFileNode.cs
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/CSharp/CSharpFileNode.cs 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/CSharp/CSharpFileNode.cs 2005-06-05 11:26:17 UTC (rev 2588)
@@ -7,14 +7,14 @@
// (C) Copyright Jeroen Zwartepoorte 2004
//
+using log4net;
using MonoDevelop.Node;
-using log4net;
namespace MonoDevelop.CSharp {
public class CSharpFileNode : TextFileNode {
static private readonly ILog log = LogManager.GetLogger (typeof (CSharpFileNode));
- public CSharpFileNode (Project project, Node parent, string filename)
+ public CSharpFileNode (Project project, Node.Node parent, string filename)
: base (project, parent, filename)
{
log.Debug ("Created instance of CSharpFileNode");
Modified: branches/MonoDevelop-plan-43/src/Plugins/CSharp/CSharpNodeViewerFactory.cs
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/CSharp/CSharpNodeViewerFactory.cs 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/CSharp/CSharpNodeViewerFactory.cs 2005-06-05 11:26:17 UTC (rev 2588)
@@ -17,7 +17,7 @@
{
}
- public bool CanDisplayNode (Node node)
+ public bool CanDisplayNode (Node.Node node)
{
return node is CSharpFileNode;
}
Added: branches/MonoDevelop-plan-43/src/Plugins/CSharp/Makefile.am
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/CSharp/Makefile.am 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/CSharp/Makefile.am 2005-06-05 11:26:17 UTC (rev 2588)
@@ -0,0 +1,42 @@
+CSC = $(MCS) $(MCS_FLAGS) $(CSFLAGS)
+
+TARGET = csharp
+
+PLUGIN_CSFILES = \
+ CSharpFileNode.cs \
+ CSharpNodeViewer.cs \
+ CSharpNodeViewerFactory.cs
+
+PLUGIN_ASSEMBLIES = \
+ -r:$(top_builddir)/lib/log4net.dll \
+ -r:$(top_builddir)/lib/MonoDevelop.Dock.dll \
+ -r:$(top_builddir)/src/Core/monodevelop.exe \
+ -r:$(top_builddir)/src/Plugins/Node/node.dll \
+ -r:$(top_builddir)/src/Plugins/Workbench/workbench.dll \
+ -r:$(top_builddir)/src/Plugins/Content/content.dll \
+ -r:$(top_builddir)/src/Plugins/Editor/editor.dll \
+ $(GTKSHARP_LIBS) \
+ $(GTKSOURCEVIEWSHARP_LIBS)
+
+PLUGIN_RESOURCES =
+
+$(TARGET).plugin: $(srcdir)/$(TARGET).plugin.in
+ sed -e "s|\@assembly\@|$(plugindir)/$(TARGET).dll|" \
+ < $^ > $@
+
+$(TARGET).dll: $(PLUGIN_CSFILES)
+ $(CSC) -target:library -out:$@ $(PLUGIN_CSFILES) $(PLUGIN_ASSEMBLIES) $(PLUGIN_RESOURCES)
+
+$(TARGET): $(TARGET).plugin $(TARGET).dll
+
+all: $(TARGET)
+
+pluginlibdir = $(plugindir)
+pluginlib_DATA = $(TARGET).plugin $(TARGET).dll
+
+EXTRA_DIST = \
+ $(PLUGIN_CSFILES) \
+ csharp.plugin.in
+
+CLEANFILES = \
+ $(TARGET)
Deleted: branches/MonoDevelop-plan-43/src/Plugins/CSharp/csharp.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/CSharp/csharp.build 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/CSharp/csharp.build 2005-06-05 11:26:17 UTC (rev 2588)
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<project name="monodevelop.plugins.csharp" default="build">
- <!-- build the project -->
- <target name="build" description="compiles the source code">
- <property name="assemblyfile" value="${path::combine(plugin.dir, 'csharp.dll')}"/>
- <csc target="library" output="${assemblyfile}" debug="${build.debug}">
- <arg value="${gtk-sharp.libs}"/>
- <arg value="${gtksourceview-sharp.libs}"/>
- <sources>
- <include name="*.cs"/>
- </sources>
- <references>
- <include name="${lib.dir}/log4net.dll"/>
- <include name="${bin.dir}/monodevelop.exe"/>
- <include name="${lib.dir}/gdl-sharp.dll"/>
- <include name="${plugin.dir}/node.dll"/>
- <include name="${plugin.dir}/workbench.dll"/>
- <include name="${plugin.dir}/content.dll"/>
- <include name="${plugin.dir}/editor.dll"/>
- </references>
- </csc>
-
- <!-- install the plugin file -->
- <copy file="csharp.plugin.in" tofile="csharp.plugin">
- <filterchain>
- <replacetokens>
- <token key="assembly" value="${assemblyfile}"/>
- </replacetokens>
- </filterchain>
- </copy>
- <move file="csharp.plugin" todir="${plugin.dir}" overwrite="true"/>
- </target>
-</project>
Property changes on: branches/MonoDevelop-plan-43/src/Plugins/Content
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
content.dll
content.dll.mdb
content.plugin
Modified: branches/MonoDevelop-plan-43/src/Plugins/Content/ContentManager.cs
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Content/ContentManager.cs 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/Content/ContentManager.cs 2005-06-05 11:26:17 UTC (rev 2588)
@@ -45,7 +45,7 @@
group.Add (action, "<control>s");
Workbench.Workbench.AddActionGroup (group);
- Workbench.Workbench.AddUiFromFile ("content.ui");
+ Workbench.Workbench.AddUiFromResource ("content.ui");
}
////////////////////////////////////////////////////////////////////////
@@ -97,7 +97,7 @@
log.Debug ("Found FileNode type: " + entry.Type);
Type[] types = new Type[3];
types[0] = typeof (Project);
- types[1] = typeof (Node);
+ types[1] = typeof (Node.Node);
types[2] = typeof (string);
ConstructorInfo ci = entry.Type.GetConstructor (BindingFlags.Instance | BindingFlags.Public,
null, CallingConventions.HasThis,
Modified: branches/MonoDevelop-plan-43/src/Plugins/Content/ContentManagerWidgetFactory.cs
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Content/ContentManagerWidgetFactory.cs 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/Content/ContentManagerWidgetFactory.cs 2005-06-05 11:26:17 UTC (rev 2588)
@@ -40,7 +40,7 @@
}
}
- public Widget CreateWidget (Workbench workbench)
+ public Widget CreateWidget (Workbench.Workbench workbench)
{
return new ContentManager ();
}
Modified: branches/MonoDevelop-plan-43/src/Plugins/Content/Context.cs
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Content/Context.cs 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/Content/Context.cs 2005-06-05 11:26:17 UTC (rev 2588)
@@ -13,22 +13,22 @@
namespace MonoDevelop.Content {
public class Context {
- private Workbench workbench;
- private Node node;
+ private Workbench.Workbench workbench;
+ private Node.Node node;
- public Context (Workbench workbench, Node node)
+ public Context (Workbench.Workbench workbench, Node.Node node)
{
this.workbench = workbench;
this.node = node;
}
- public Workbench Workbench {
+ public Workbench.Workbench Workbench {
get {
return workbench;
}
}
- public Node Node {
+ public Node.Node Node {
get {
return node;
}
Modified: branches/MonoDevelop-plan-43/src/Plugins/Content/INodeViewerFactory.cs
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Content/INodeViewerFactory.cs 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/Content/INodeViewerFactory.cs 2005-06-05 11:26:17 UTC (rev 2588)
@@ -16,7 +16,7 @@
namespace MonoDevelop.Content {
public interface INodeViewerFactory {
- bool CanDisplayNode (Node node);
+ bool CanDisplayNode (Node.Node node);
INodeViewer CreateNodeViewer (Context context);
}
Added: branches/MonoDevelop-plan-43/src/Plugins/Content/Makefile.am
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Content/Makefile.am 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/Content/Makefile.am 2005-06-05 11:26:17 UTC (rev 2588)
@@ -0,0 +1,45 @@
+CSC = $(MCS) $(MCS_FLAGS) $(CSFLAGS)
+
+TARGET = content
+
+PLUGIN_CSFILES = \
+ AbstractNodeViewer.cs \
+ ContentManager.cs \
+ ContentManagerWidgetFactory.cs \
+ ContentView.cs \
+ Context.cs \
+ INodeViewer.cs \
+ INodeViewerFactory.cs
+
+PLUGIN_ASSEMBLIES = \
+ -r:$(top_builddir)/lib/log4net.dll \
+ -r:$(top_builddir)/lib/MonoDevelop.Dock.dll \
+ -r:$(top_builddir)/src/Core/monodevelop.exe \
+ -r:$(top_builddir)/src/Plugins/Node/node.dll \
+ -r:$(top_builddir)/src/Plugins/Workbench/workbench.dll \
+ $(GTKSHARP_LIBS)
+
+PLUGIN_RESOURCES = \
+ -resource:$(srcdir)/content.ui,content.ui
+
+$(TARGET).plugin: $(srcdir)/$(TARGET).plugin.in
+ sed -e "s|\@assembly\@|$(plugindir)/$(TARGET).dll|" \
+ < $^ > $@
+
+$(TARGET).dll: $(PLUGIN_CSFILES)
+ $(CSC) -target:library -out:$@ $(PLUGIN_CSFILES) $(PLUGIN_ASSEMBLIES) $(PLUGIN_RESOURCES)
+
+$(TARGET): $(TARGET).plugin $(TARGET).dll
+
+all: $(TARGET)
+
+pluginlibdir = $(plugindir)
+pluginlib_DATA = $(TARGET).plugin $(TARGET).dll
+
+EXTRA_DIST = \
+ $(PLUGIN_CSFILES) \
+ content.plugin.in \
+ content.ui
+
+CLEANFILES = \
+ $(TARGET)
Deleted: branches/MonoDevelop-plan-43/src/Plugins/Content/content.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Content/content.build 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/Content/content.build 2005-06-05 11:26:17 UTC (rev 2588)
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<project name="monodevelop.plugins.content" default="build">
- <!-- build the project -->
- <target name="build" description="compiles the source code">
- <property name="assemblyfile" value="${path::combine(plugin.dir, 'content.dll')}"/>
- <csc target="library" output="${assemblyfile}" debug="${build.debug}">
- <arg value="${gnome-sharp.libs}"/>
- <arg value="${gnome-vfs-sharp.libs}"/>
- <sources>
- <include name="*.cs"/>
- </sources>
- <references>
- <include name="${lib.dir}/log4net.dll"/>
- <include name="${bin.dir}/monodevelop.exe"/>
- <include name="${lib.dir}/gdl-sharp.dll"/>
- <include name="${plugin.dir}/node.dll"/>
- <include name="${plugin.dir}/workbench.dll"/>
- </references>
- </csc>
-
- <!-- install the plugin file -->
- <copy file="content.plugin.in" tofile="content.plugin">
- <filterchain>
- <replacetokens>
- <token key="assembly" value="${assemblyfile}"/>
- </replacetokens>
- </filterchain>
- </copy>
- <move file="content.plugin" todir="${plugin.dir}" overwrite="true"/>
-
- <!-- install the ui file -->
- <copy file="content.ui" todir="${ui.dir}"/>
- </target>
-</project>
Property changes on: branches/MonoDevelop-plan-43/src/Plugins/Editor
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
editor.dll
editor.dll.mdb
editor.plugin
Added: branches/MonoDevelop-plan-43/src/Plugins/Editor/Makefile.am
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Editor/Makefile.am 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/Editor/Makefile.am 2005-06-05 11:26:17 UTC (rev 2588)
@@ -0,0 +1,44 @@
+CSC = $(MCS) $(MCS_FLAGS) $(CSFLAGS)
+
+TARGET = editor
+
+PLUGIN_CSFILES = \
+ EditorManager.cs \
+ EditorView.cs \
+ TextNodeViewer.cs \
+ TextNodeViewerFactory.cs
+
+PLUGIN_ASSEMBLIES = \
+ -r:$(top_builddir)/lib/log4net.dll \
+ -r:$(top_builddir)/lib/MonoDevelop.Dock.dll \
+ -r:$(top_builddir)/src/Core/monodevelop.exe \
+ -r:$(top_builddir)/src/Plugins/Node/node.dll \
+ -r:$(top_builddir)/src/Plugins/Workbench/workbench.dll \
+ -r:$(top_builddir)/src/Plugins/Content/content.dll \
+ $(GTKSHARP_LIBS) \
+ $(GTKSOURCEVIEWSHARP_LIBS)
+
+PLUGIN_RESOURCES = \
+ -resource:$(srcdir)/editor.ui,editor.ui
+
+$(TARGET).plugin: $(srcdir)/$(TARGET).plugin.in
+ sed -e "s|\@assembly\@|$(plugindir)/$(TARGET).dll|" \
+ < $^ > $@
+
+$(TARGET).dll: $(PLUGIN_CSFILES)
+ $(CSC) -target:library -out:$@ $(PLUGIN_CSFILES) $(PLUGIN_ASSEMBLIES) $(PLUGIN_RESOURCES)
+
+$(TARGET): $(TARGET).plugin $(TARGET).dll
+
+all: $(TARGET)
+
+pluginlibdir = $(plugindir)
+pluginlib_DATA = $(TARGET).plugin $(TARGET).dll
+
+EXTRA_DIST = \
+ $(PLUGIN_CSFILES) \
+ editor.plugin.in \
+ editor.ui
+
+CLEANFILES = \
+ $(TARGET)
Modified: branches/MonoDevelop-plan-43/src/Plugins/Editor/TextNodeViewerFactory.cs
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Editor/TextNodeViewerFactory.cs 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/Editor/TextNodeViewerFactory.cs 2005-06-05 11:26:17 UTC (rev 2588)
@@ -17,7 +17,7 @@
{
}
- public bool CanDisplayNode (Node node)
+ public bool CanDisplayNode (Node.Node node)
{
return node is TextFileNode;
}
Deleted: branches/MonoDevelop-plan-43/src/Plugins/Editor/editor.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Editor/editor.build 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/Editor/editor.build 2005-06-05 11:26:17 UTC (rev 2588)
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<project name="monodevelop.plugins.editor" default="build">
- <!-- build the project -->
- <target name="build" description="compiles the source code">
- <property name="assemblyfile" value="${path::combine(plugin.dir, 'editor.dll')}"/>
- <csc target="library" output="${assemblyfile}" debug="${build.debug}">
- <arg value="${gtk-sharp.libs}"/>
- <arg value="${gtksourceview-sharp.libs}"/>
- <sources>
- <include name="*.cs"/>
- </sources>
- <references>
- <include name="${lib.dir}/log4net.dll"/>
- <include name="${bin.dir}/monodevelop.exe"/>
- <include name="${lib.dir}/gdl-sharp.dll"/>
- <include name="${plugin.dir}/node.dll"/>
- <include name="${plugin.dir}/workbench.dll"/>
- <include name="${plugin.dir}/content.dll"/>
- </references>
- </csc>
-
- <!-- install the plugin file -->
- <copy file="editor.plugin.in" tofile="editor.plugin">
- <filterchain>
- <replacetokens>
- <token key="assembly" value="${assemblyfile}"/>
- </replacetokens>
- </filterchain>
- </copy>
- <move file="editor.plugin" todir="${plugin.dir}" overwrite="true"/>
-
- <!-- install the ui file -->
- <copy file="editor.ui" todir="${ui.dir}"/>
- </target>
-</project>
Added: branches/MonoDevelop-plan-43/src/Plugins/Makefile.am
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Makefile.am 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/Makefile.am 2005-06-05 11:26:17 UTC (rev 2588)
@@ -0,0 +1 @@
+SUBDIRS = Node Workbench Content Editor CSharp
Property changes on: branches/MonoDevelop-plan-43/src/Plugins/Node
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
node.dll
node.dll.mdb
node.plugin
Added: branches/MonoDevelop-plan-43/src/Plugins/Node/Makefile.am
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Node/Makefile.am 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/Node/Makefile.am 2005-06-05 11:26:17 UTC (rev 2588)
@@ -0,0 +1,38 @@
+CSC = $(MCS) $(MCS_FLAGS) $(CSFLAGS)
+
+TARGET = node
+
+PLUGIN_CSFILES = \
+ Buffer.cs \
+ BufferMemoryStream.cs \
+ FileNode.cs \
+ Node.cs \
+ Project.cs \
+ ReadOnlyException.cs \
+ TextFileNode.cs
+
+PLUGIN_ASSEMBLIES = \
+ -r:$(top_builddir)/lib/log4net.dll \
+ $(GTKSHARP_LIBS)
+
+PLUGIN_RESOURCES =
+
+$(TARGET).plugin: $(srcdir)/$(TARGET).plugin.in
+ sed -e "s|\@assembly\@|$(plugindir)/$(TARGET).dll|" \
+ < $^ > $@
+
+$(TARGET).dll: $(PLUGIN_CSFILES)
+ $(CSC) -target:library -out:$@ $(PLUGIN_CSFILES) $(PLUGIN_ASSEMBLIES) $(PLUGIN_RESOURCES)
+
+$(TARGET): $(TARGET).plugin $(TARGET).dll
+
+all: $(TARGET)
+
+pluginlibdir = $(plugindir)
+pluginlib_DATA = $(TARGET).plugin $(TARGET).dll
+
+EXTRA_DIST = \
+ $(PLUGIN_CSFILES)
+
+CLEANFILES = \
+ $(TARGET)
Deleted: branches/MonoDevelop-plan-43/src/Plugins/Node/node.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Node/node.build 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/Node/node.build 2005-06-05 11:26:17 UTC (rev 2588)
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<project name="monodevelop.plugins.node" default="build">
- <!-- build the project -->
- <target name="build" description="compiles the source code">
- <property name="assemblyfile" value="${path::combine(plugin.dir, 'node.dll')}"/>
- <csc target="library" output="${assemblyfile}" debug="${build.debug}">
- <arg value="${gtk-sharp.libs}"/>
- <arg value="${gnome-vfs-sharp.libs}"/>
- <sources>
- <include name="*.cs"/>
- </sources>
- <references>
- <include name="${lib.dir}/log4net.dll"/>
- <include name="${bin.dir}/monodevelop.exe"/>
- </references>
- </csc>
-
- <!-- install the plugin file -->
- <copy file="node.plugin.in" tofile="node.plugin">
- <filterchain>
- <replacetokens>
- <token key="assembly" value="${assemblyfile}"/>
- </replacetokens>
- </filterchain>
- </copy>
- <move file="node.plugin" todir="${plugin.dir}" overwrite="true"/>
- </target>
-</project>
Property changes on: branches/MonoDevelop-plan-43/src/Plugins/Workbench
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
workbench.dll
workbench.dll.mdb
workbench.plugin
Added: branches/MonoDevelop-plan-43/src/Plugins/Workbench/Makefile.am
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Workbench/Makefile.am 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/Workbench/Makefile.am 2005-06-05 11:26:17 UTC (rev 2588)
@@ -0,0 +1,40 @@
+CSC = $(MCS) $(MCS_FLAGS) $(CSFLAGS)
+
+TARGET = workbench
+
+PLUGIN_CSFILES = \
+ IWorkbenchWidgetFactory.cs \
+ WorkbenchCommand.cs \
+ Workbench.cs
+
+PLUGIN_ASSEMBLIES = \
+ -r:$(top_builddir)/lib/log4net.dll \
+ -r:$(top_builddir)/lib/MonoDevelop.Dock.dll \
+ -r:$(top_builddir)/src/Core/monodevelop.exe \
+ -r:$(top_builddir)/src/Plugins/Node/node.dll \
+ $(GTKSHARP_LIBS)
+
+PLUGIN_RESOURCES = \
+ -resource:$(srcdir)/workbench.ui,workbench.ui
+
+$(TARGET).plugin: $(srcdir)/$(TARGET).plugin.in
+ sed -e "s|\@assembly\@|$(plugindir)/$(TARGET).dll|" \
+ < $^ > $@
+
+$(TARGET).dll: $(PLUGIN_CSFILES)
+ $(CSC) -target:library -out:$@ $(PLUGIN_CSFILES) $(PLUGIN_ASSEMBLIES) $(PLUGIN_RESOURCES)
+
+$(TARGET): $(TARGET).plugin $(TARGET).dll
+
+all: $(TARGET)
+
+pluginlibdir = $(plugindir)
+pluginlib_DATA = $(TARGET).plugin $(TARGET).dll
+
+EXTRA_DIST = \
+ $(PLUGIN_CSFILES) \
+ workbench.plugin.in \
+ workbench.ui
+
+CLEANFILES = \
+ $(TARGET)
Modified: branches/MonoDevelop-plan-43/src/Plugins/Workbench/Workbench.cs
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Workbench/Workbench.cs 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/Workbench/Workbench.cs 2005-06-05 11:26:17 UTC (rev 2588)
@@ -30,7 +30,8 @@
private Dock dock;
private Statusbar statusbar;
private UIManager manager;
-
+ private Hashtable actions = new Hashtable ();
+
private Workbench () : base ("MonoDevelop")
{
box = new VBox (false, 0);
@@ -111,7 +112,7 @@
group.Add (action);
AddActionGroup (group);
- AddUiFromFile ("workbench.ui");
+ AddUiFromResource ("workbench.ui");
}
private void AddWidgets ()
@@ -166,7 +167,7 @@
private void OnProxyConnect (object obj, ConnectProxyArgs args)
{
if (args.Proxy is MenuItem) {
- ((GLib.Object)args.Proxy).Data ["action"] = args.Action;
+ actions[args.Proxy] = args.Action;
((Item)args.Proxy).Selected += new EventHandler (OnSelect);
((Item)args.Proxy).Deselected += new EventHandler (OnDeselect);
}
@@ -174,7 +175,7 @@
private void OnSelect (object obj, EventArgs args)
{
- Action action = ((GLib.Object)obj).Data["action"] as Action;
+ Action action = (Action) actions[obj];
if (action.Tooltip != null)
statusbar.Push (0, action.Tooltip);
}
@@ -234,11 +235,6 @@
groups.Remove (group);
}
- public static void AddUiFromString (string ui)
- {
- uiinfos.Add (ui);
- }
-
public static void AddUiFromFile (string filename)
{
// Look in the uiPath if the filename doesn't exist.
@@ -259,7 +255,24 @@
StreamReader sr = new StreamReader (stream);
uiinfos.Add (sr.ReadToEnd ());
}
+
+ public static void AddUiFromResource (string resource)
+ {
+ if (resource == null)
+ throw new ArgumentNullException ("resource");
+
+ Stream s = System.Reflection.Assembly.GetCallingAssembly ().GetManifestResourceStream (resource);
+ if (s == null)
+ throw new ArgumentException ("resource must be a valid resource name of 'assembly'.");
+
+ AddUiFromString (new StreamReader (s).ReadToEnd ());
+ }
+ public static void AddUiFromString (string ui)
+ {
+ uiinfos.Add (ui);
+ }
+
public static void AddWidgetFactory (IWorkbenchWidgetFactory factory)
{
widgets.Add (factory);
Deleted: branches/MonoDevelop-plan-43/src/Plugins/Workbench/workbench.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/Workbench/workbench.build 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/Workbench/workbench.build 2005-06-05 11:26:17 UTC (rev 2588)
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<project name="monodevelop.plugins.workbench" default="build">
- <!-- build the project -->
- <target name="build" description="compiles the source code">
- <property name="assemblyfile" value="${path::combine(plugin.dir, 'workbench.dll')}"/>
- <csc target="library" output="${assemblyfile}" debug="${build.debug}">
- <arg value="${gnome-sharp.libs}"/>
- <sources>
- <include name="*.cs"/>
- </sources>
- <references>
- <include name="${lib.dir}/log4net.dll"/>
- <include name="${bin.dir}/monodevelop.exe"/>
- <include name="${lib.dir}/gdl-sharp.dll"/>
- </references>
- </csc>
-
- <!-- install the plugin file -->
- <copy file="workbench.plugin.in" tofile="workbench.plugin">
- <filterchain>
- <replacetokens>
- <token key="assembly" value="${assemblyfile}"/>
- </replacetokens>
- </filterchain>
- </copy>
- <move file="workbench.plugin" todir="${plugin.dir}" overwrite="true"/>
-
- <!-- install the ui file -->
- <copy file="workbench.ui" todir="${ui.dir}"/>
- </target>
-</project>
Deleted: branches/MonoDevelop-plan-43/src/Plugins/plugins.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/plugins.build 2005-06-04 21:12:12 UTC (rev 2587)
+++ branches/MonoDevelop-plan-43/src/Plugins/plugins.build 2005-06-05 11:26:17 UTC (rev 2588)
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<project name="monodevelop.plugins" default="build">
- <property name="plugin.dir" value="${path::combine(lib.dir, 'monodevelop')}"/>
- <property name="ui.dir" value="${path::combine(share.dir, 'ui')}"/>
-
- <!-- cleanup build files -->
- <target name="clean" description="remove all files created by the build task">
- <delete dir="${plugin.dir}" failonerror="false"/>
- </target>
-
- <!-- build the project -->
- <target name="build" description="compiles the source code">
- <!-- create directories -->
- <mkdir dir="${plugin.dir}"/>
- <!-- build MonoDevelop.Node assembly -->
- <nant buildfile="Node/node.build" target="build"/>
- <!-- build MonoDevelop.Workbench assembly -->
- <nant buildfile="Workbench/workbench.build" target="build"/>
- <!-- build MonoDevelop.Content assembly -->
- <nant buildfile="Content/content.build" target="build"/>
- <!-- build MonoDevelop.Editor assembly -->
- <nant buildfile="Editor/editor.build" target="build"/>
- <!-- build MonoDevelop.Parser assembly -->
- <!-- <nant buildfile="Parser/parser.build" target="build"/> -->
- <!-- build MonoDevelop.CSharp assembly -->
- <nant buildfile="CSharp/csharp.build" target="build"/>
- </target>
-</project>
More information about the Monodevelop-patches-list
mailing list