From beee6439037d9746c7f242addc89ae5aca672b50 Mon Sep 17 00:00:00 2001 From: Giorgos Migdos Date: Thu, 1 May 2014 17:00:36 +0300 Subject: [PATCH] Update Java Gnome dependency to 4.1.2 (simplifies build process) --- AUTHORS | 2 +- Makefile | 6 +- README.md | 34 +- build-all | 53 -- build-tarball | 8 - lib-docs/java-gnome-docs/AUTHORS | 72 --- lib-docs/java-gnome-docs/COPYING | 339 ------------- lib-docs/java-gnome-docs/HACKING | 271 ---------- lib-docs/java-gnome-docs/LICENSE | 98 ---- manifest-libs | 2 +- nbproject/build-impl.xml | 574 +++++++++++++++++----- nbproject/genfiles.properties | 4 +- nbproject/private/private.properties | 2 +- nbproject/private/private.xml | 4 + nbproject/project.properties | 13 +- src/lingua/resources/StringResources.java | 2 +- 16 files changed, 497 insertions(+), 987 deletions(-) delete mode 100755 build-all delete mode 100644 lib-docs/java-gnome-docs/AUTHORS delete mode 100644 lib-docs/java-gnome-docs/COPYING delete mode 100644 lib-docs/java-gnome-docs/HACKING delete mode 100644 lib-docs/java-gnome-docs/LICENSE diff --git a/AUTHORS b/AUTHORS index 5421a8e..9a13904 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,2 @@ Georgios Migdos (Main developer) -Savvas Radevic (Makefile fixes and bug reports) +Savvas Radevic (Makefile fixes, bug reports and debian packaging) diff --git a/Makefile b/Makefile index 76ca85e..a0868d8 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,8 @@ #* THE SOFTWARE. #* all: - ./build-all + ant clean jar + jar umf manifest-libs dist/lingua.jar clean: ant clean @@ -46,10 +47,11 @@ install: mkdir -p $(DESTDIR)/usr/share/applications mkdir -p $(DESTDIR)/usr/share/doc/lingua cp dist/lingua.jar $(DESTDIR)/usr/local/lingua/lingua.jar + chmod ugo+rx $(DESTDIR)/usr/local/lingua/lingua.jar cp misc/source_printer.py $(DESTDIR)/usr/local/lingua/source_printer.py - cp -R dist/lib $(DESTDIR)/usr/local/lingua cp -R help $(DESTDIR)/usr/share/doc/lingua cp misc/lingua-icon.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/lingua.svg + chmod ugo+r $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/lingua.svg cp sourceview-files/glossa.lang $(DESTDIR)/usr/share/gtksourceview-3.0/language-specs/glossa.lang cp sourceview-files/glossa.xml $(DESTDIR)/usr/share/gtksourceview-3.0/styles/glossa.xml cp misc/lingua.desktop $(DESTDIR)/usr/share/applications/lingua.desktop diff --git a/README.md b/README.md index a94e032..69993da 100644 --- a/README.md +++ b/README.md @@ -28,45 +28,29 @@ Lingua στα Λατινικά σημαίνει «γλώσσα». Πρόκειτ * OpenJDK JDK ≥6u10 -* Git - * Ant -* JUnit - -* libglib2.0-dev ≥ 2.28.0 - -* libgtk-3-dev ≥ 3.0.4 - -* libcairo-gobject2 ≥ 1.10.0 - -* libpango1.0-dev ≥ 1.28.0 - -* libgtksourceview-3.0-dev ≥ 2.91.9 - -* libnotify-dev ≥ 0.7.0 - -* libunique-3.0-dev ≥ 3.0 +* Antlr3 -* libenchant-dev ≥ 1.4.2 +* JOptSimple -* librsvg2-dev ≥ 2.32.0 +* Java-Gnome (libjava-gnome-java & libjava-gnome-jni) ≥4.1.2 Πρώτα πρέπει να εγκαταστήσουμε το διερμηνευτή: cd ~ - wget https://dl.dropbox.com/u/599926/releases/glossa-interpreter-1.0.5.tar.gz - tar -xvf glossa-interpreter-1.0.5.tar.gz - cd glossa-interpreter-1.0.5 + wget https://dl.dropboxusercontent.com/u/599926/releases/glossa-interpreter-1.0.7.tar.gz + tar -xvf glossa-interpreter-1.0.7.tar.gz + cd glossa-interpreter-1.0.7 make sudo make install Έπειτα εγκαθιστούμε την εφαρμογή, εκτελώντας τις παρακάτω εντολές σε ένα τερματικό: cd ~ - wget https://github.com/downloads/cyberpython/lingua/lingua-0.0.5.tar.gz - tar -xvf lingua-0.0.5.tar.gz - cd lingua-0.0.5 + wget https://dl.dropboxusercontent.com/u/599926/releases/lingua-0.0.6.tar.gz + tar -xvf lingua-0.0.6.tar.gz + cd lingua-0.0.6 make sudo make install diff --git a/build-all b/build-all deleted file mode 100755 index 025cfa5..0000000 --- a/build-all +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -#* -#* The MIT License -#* -#* Copyright 2012 Georgios Migdos . -#* -#* Permission is hereby granted, free of charge, to any person obtaining a copy -#* of this software and associated documentation files (the "Software"), to deal -#* in the Software without restriction, including without limitation the rights -#* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -#* copies of the Software, and to permit persons to whom the Software is -#* furnished to do so, subject to the following conditions: -#* -#* The above copyright notice and this permission notice shall be included in -#* all copies or substantial portions of the Software. -#* -#* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -#* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -#* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -#* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -#* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -#* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -#* THE SOFTWARE. -#* - -mkdir -p lib - -if [ ! -f lib/gtk-4.1.jar ] -then - - if [ ! -d java-gnome ] - then - git clone git://github.com/cyberpython/java-gnome.git - fi - - cd java-gnome - - ./configure - - make - - cd ../ - - cp java-gnome/tmp/gtk-4.1.jar lib/gtk-4.1.jar - cp java-gnome/tmp/libgtkjni-4.1.2-dev.so lib/libgtkjni-4.1.2-dev.so -fi - -ant clean jar - -mkdir -p dist -cp -R lib dist -jar umf manifest-libs dist/lingua.jar diff --git a/build-tarball b/build-tarball index 97acf1a..bf1f6fa 100755 --- a/build-tarball +++ b/build-tarball @@ -36,15 +36,12 @@ fi mkdir -p binaries/$TARGET_DIR cp -R help binaries/$TARGET_DIR -cp -R java-gnome binaries/$TARGET_DIR -cp -R lib-docs binaries/$TARGET_DIR cp -R misc binaries/$TARGET_DIR cp -R nbproject binaries/$TARGET_DIR cp -R sourceview-files binaries/$TARGET_DIR cp -R src binaries/$TARGET_DIR cp AUTHORS binaries/$TARGET_DIR/AUTHORS cp build.xml binaries/$TARGET_DIR/build.xml -cp build-all binaries/$TARGET_DIR/build-all cp build-tarball binaries/$TARGET_DIR/build-tarball cp COPYING binaries/$TARGET_DIR/COPYING cp Makefile binaries/$TARGET_DIR/Makefile @@ -52,11 +49,6 @@ cp manifest.mf binaries/$TARGET_DIR/manifest.mf cp manifest-libs binaries/$TARGET_DIR/manifest-libs cp README.md binaries/$TARGET_DIR/README.md -if [ -d binaries/$TARGET_DIR/java-gnome/tmp ] -then - rm -rf binaries/$TARGET_DIR/java-gnome/tmp -fi - cd binaries if [ -f lingua-$1-src.tar.gz ] diff --git a/lib-docs/java-gnome-docs/AUTHORS b/lib-docs/java-gnome-docs/AUTHORS deleted file mode 100644 index 97c44e1..0000000 --- a/lib-docs/java-gnome-docs/AUTHORS +++ /dev/null @@ -1,72 +0,0 @@ -AUTHORS - -Principal architects --------------------- - - Andrew Cowie - Srichand Pendyala - Vreixo Formoso Lopes - -Significant authors -------------------- - - Sebastian Mancke - Stefan Prelle - Serkan Kaba - Guillaume Mazoyer - -Casual contributors -------------------- - - Wouter Bolsterlee - Nat Pryce - Remy Suen - Thomas Schmitz - Mario Torre - Manu Mahajan - Andreas Kühntopf - Zak Fenton - Stefan Schweizer - Kenneth Prugh - Thijs Leibbrand - -Mentoring and design review ---------------------------- - - Owen Taylor - Carl Worth - -Build system improvements -------------------------- - - Laszlo Peter - Michael Kedzierski - Maciej Piechotka - Vincent Geddes - Karsten Bräckelmann - Timm Preetz - Colin Walters - Rob Taylor - Yaakov Selkowitz - Alexander Boström - --- - -Although java-gnome 4.0 is a complete from-the-ground-up rewrite, certain -parts would not have been possible without the example and inspiration -provided by the generations of authors and maintainers of java-gnome leading -up to 2006. We owe them an enormous debt of gratitude. - -Where significant portions of code is re-used, the copyright and authorship -noted in a given file reflect it. Otherwise the authors of java-gnome, and the -copyright they exert as owners of their work, are summarized above and listed -on a file by file basis. - - diff --git a/lib-docs/java-gnome-docs/COPYING b/lib-docs/java-gnome-docs/COPYING deleted file mode 100644 index d511905..0000000 --- a/lib-docs/java-gnome-docs/COPYING +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, 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 Lesser 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. - - - Copyright (C) - - 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. - -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. - - , 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 Lesser General -Public License instead of this License. diff --git a/lib-docs/java-gnome-docs/HACKING b/lib-docs/java-gnome-docs/HACKING deleted file mode 100644 index 1bb16ae..0000000 --- a/lib-docs/java-gnome-docs/HACKING +++ /dev/null @@ -1,271 +0,0 @@ -Contributing to java-gnome - -We'd love to have you contribute by hacking on the bindings themselves! - -GETTING STARTED -=============== - -1. Checkout the source code ---------------------------- - -We are using Bazaar to manage our source code. More commonly known as `bzr`, -it is an advanced third-generation Distributed Version [or Revision] Control -System. It's a good idea to have a recent version (ie `bzr >= 2.3`). - -If you're going to hack seriously with, or on, java-gnome, we recommend the -following sequence to checkout the source code: - - - - $ cd ~/src/ - $ bzr init-repository java-gnome/ - $ cd java-gnome/ - $ bzr checkout bzr://research.operationaldynamics.com/bzr/java-gnome/mainline/ mainline/ - $ bzr branch mainline/ working/ - $ cd working/ - $ less README - - - -This will result in a local copy of '`mainline`' which you can use to track -upstream and to diff against, and '`working`' as new branch for you to play -with. `:)` The branch will be at (in this example) -`~/src/java-gnome/working/`. All branches under `~/src/java-gnome/` will share -storage of revisions, so you won't pay any penalty for creating as many -branches as you like. - -If you are using Eclipse, we recommend creating a branch in your Workspace and -using that to work on. This will allow you to relatively easily change -branches while not screwing up all your launchers. - - $ cd ~/workspace/ - $ bzr checkout ~/src/java-gnome/working java-gnome - $ cd ~/workspace/java-gnome/ - $ less README - -Doing it this way allows you to later do - - $ bzr switch some-other-branch - -to change between branches you have created with different lines of -development. This works well, but is an advanced layout, so do experiement -with it a bit if you aren't well versed in distributed version control -practises. - -### And build! - -If you haven't already read them, see the instructions in the top level -[`README`](README.html) for how to install from a source tarball and what -options you can supply to the `./configure` script. - -### Why `bzr`? - -We chose Bazaar (Bazaar-NG, as it was briefly known) as the VCS for the Java -bindings for GNOME because of its relative straight-forwardness and because of -our faith in the ethos and extreme competence of its developers. Anyone -experienced with the old world 1st generation centralized VCS tools like CVS -or Subversion will be able to make sense of it and you can learn from there. -Bazaar is constantly improving in performance terms, has a vibrant developer -community, is widely portable. Most of all, the fact that the people hacking -on `bzr` itself actually follow test-driven-development practises (their unit -test suite has over 15,000 tests!) keeps them honest and conclusively biases -in their favour. - -In production use for the last three years, we have found Bazaar to be reliable, -amazingly easy for newcomers to the Open Source world to learn, and a -significant element in our effort to reduce barriers to entry. - -We reiterate that you must use a recent version of Bazaar. There is nothing -intrinsically better about older software; bug fixes and performance -improvements are not back-ported by the people who write the code; they -release a new version instead. If your operating system does not provide `>= -2.0` then you would do well to install `bzr` manually. - -2. Do your own thing! ---------------------- - -The amazing thing about the decentralized VCS tools is that you do not need to -be online to make commits. But it's more than that -- you don't need to be me -to make commits! You can work away on your own branch(es) and then send your -patches _in already committed form_ to me for consideration and merging. - -Make sure to identify yourself first: - - $ bzr whoami 'George Jones ' - -_before_ committing the first time -- see [setting your user ID](doc/style/CommitMessages.html#id). - - -### A day in the life of a java-gnome hacker - -As you are working, you can see what you have done with: - - $ bzr status - $ bzr diff - -then, when you are happy with a piece of work, commit: - - $ bzr commit - -You can do this one or more times. - -There is a vitally important point, however: no one can tell you you can't -work on something. And of you want to share it, go right ahead. That said, if you'd like to see your work merged into the mainline and available publicly in the official releases, then we'd encourage you to follow the stylistic guidelines discussed out below. - -### Staying up to date - -Meanwhile, you'll want to catch-up with what's been going on upstream. So -update the checkout you have of mainline with the following: - - $ cd ../mainline - $ bzr update - -Then you need to merge in the upstream changes into your branch: - - $ cd ../working - $ bzr merge - -Merging only brings the changes to your working directory; it doesn't _commit_ -them to your working branch. So, assuming you want to accept them, you need to -do a commit of those changes. So, Look at the changes that were pulled in -with: - - $ bzr status - $ bzr diff - -then commit: - - $ bzr commit - -but make sure you only commit the stuff you've merged in, not unfinished -changes you've might have locally! In other words, best to do the merge after -you've finished anything you might happen to be doing in that branch. - -### To send a patch - -If you've done some work on your local branch and you'd like to contribute it, -go ahead and commit it locally in your working branch, then try the following: - - $ bzr bundle ../mainline > /tmp/name-that-tune.patch - -This will output a human readable diff along with the actual revisions in a -safely encoded form into the file you specify. Just attach that file to an -email and send it along. `.patch` is a good suffix because most mail clients -know to set the MIME type of such an attachment properly. - - -TECHNICAL DETAILS -================= - -The java-gnome bindings are pretty straight forward, so in terms of adding -new coverage you can probably pick things up by example fairly easily. But you -really should take the time to understand *why* things work, or you won't be -able to understand the mechanisms involved behind the scene. - -API design and overall system architecture ------------------------------------------- - -In the `doc/design/` subdirectory you will find extensive documentation of the -current re-engineering process that lead to the design and architecture of the -java-gnome bindings. Try starting with -[`doc/design/START`](doc/design/START.html). - -You really are encouraged to peruse these files; the one on Architecture in -particular is pretty much required reading if you want to understand what's -going on. - -STYLE GUIDE -=========== - -Things like how you format your code, what editor you use, etc are all very -personal issues, but for a project to function with anything even remotely -resembling sanity, there need to be some standards and conventions. Thus we -have several documents outlining the style guidelines you'll need to know if -hacking on the java-gnome 4.x bindings. They're in the `doc/style/` directory. - -Code formatting ---------------- - -I've carefully documented the 4 divergences from the otherwise default "Java -conventions" for Java source code formatting. Please take a moment to read -[`doc/style/CodeFormat`](doc/style/CodeFormat.html); your patches have a much -better chance of being accepted if they produce clean diffs, and that's more -likely to happen if you stick to these rules. - -Commit Messages ---------------- - -There are just a few minor conventions you should be aware of when committing -patches. See [`doc/style/CommitMessages`](doc/style/CommitMessages.html). - -Documentation -------------- - -JavaDoc is the heart and soul of our API documentation and good JavaDoc is -going to be *the* key defining criteria for our bindings being **approachable** -to new developers. As such we've written out considerable guidance about how -to best go about documenting our public APIs. - -Of course, JavaDoc alone isn't sufficient, and we have a number of supporting -documents describing the design and architecture of java-gnome. See -[`doc/style/Documentation`](doc/style/Documentation.html) for discussion of -appropriate style for both in-code JavaDoc and supporting textual Design -documentation. - -Markup ------- - -We have gone to considerable trouble to ensure our text documentation files are -readable from a terminal window, but by using a simple yet powerful markup -syntax called Markdown we can also easily render these files to useful web -pages. See [`doc/style/MARKUP`](doc/style/MARKUP.html). - - -CONCLUSION -========== - -The opportunity to work on something you love is the greatest experience you -can have. If you or your company chooses to offer code you write, be it -towards helping us on this project or on any other endeavour whatsoever, I -encourage you to choose to let others use your work as Software Libre and in -your own turn help people find their own passion and excitement. By your -actions you lift us all up. I hope you'll join us! - -Apotheosis Rising. - -AfC - -`--` -Andrew Frederick Cowie -Managing Director, -[Operational Dynamics](http://www.operationaldynamics.com/), -a Change Management consultancy... - -Maintainer, -[java-gnome](http://java-gnome.sourceforge.net/), -opening GTK and GNOME to Java programmers! - -_Last modified 22 Mar 11_ - - diff --git a/lib-docs/java-gnome-docs/LICENSE b/lib-docs/java-gnome-docs/LICENSE deleted file mode 100644 index 6f394f8..0000000 --- a/lib-docs/java-gnome-docs/LICENSE +++ /dev/null @@ -1,98 +0,0 @@ -LICENCE - -This is the java-gnome user interface library allowing you to write GTK and -GNOME programs from Java! - - Copyright © 2006-2010 Operational Dynamics Consulting, Pty Ltd and Others - -See [`AUTHORS`](AUTHORS.html) file for contributors. - -1) java-gnome source code and documentation -------------------------------------------- - -java-gnome is Logiciel Libre and is Open Source; you can redistribute it -and/or modify it under the terms of the GNU General Public License, version 2 -("GPL"). - -Linking this library statically or dynamically with other modules is making a -combined work based on this library. Thus, the terms and conditions of the GPL -cover the whole combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent modules, and -to copy and distribute the resulting executable under terms of your choice, -provided that you also meet, for each linked independent module, the terms and -conditions of the license of that module. An independent module is a module -which is not derived from or based on this library. If you modify this -library, you may extend this exception to your version of the library, but you -are not obligated to do so. If you do not wish to do so, delete this exception -statement from your version. - -_In other words, if you change java-gnome itself, you can still link against -it, but you must publish the changes you made to this library._ - --- - -java-gnome 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 GPL for more details. In particular, note that -if you use this and lose your data, you're on your own. - -Of course, if you find a bug, please let us know. And, if you fix anything or -improve the code please contribute your changes back -- that's the whole idea -of Open Source. See [`BUGS`](/4.0/lists/#bugs) and [`HACKING`](HACKING.html) -files for details. - -You should have a copy of the GPL somewhere on your system. If you don't, see -[`http://www.gnu.org/licenses/`][GPL] or write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -2) prerequisites and dependencies ---------------------------------- - -java-gnome depends on a number of external libraries. They are either provided -by your operating system distribution or, in some cases, may be shipped -alongside the java-gnome sources in the `lib/` subdirectory. That code is open -source (or we couldn't have redistributed it), but note that third party -sources are made available under the terms specified by their authors and as -documented in the individual licences within those files, as noted below and -in `lib/README`. - -The most notable dependency, of course, is GNOME itself. You will need to have -a recent version of GLib, Cairo, GTK, and many of the other GNOME libraries -installed in order to build java-gnome and use it in your programs. Just in -case you are wondering, this is a feature, not a bug. - -3) use of Java --------------- - -The public API of the java-gnome library is expressed in the Java programming -language with the glue code to reach the native libraries it wraps written -jointly in Java and C. - -You have the option of building and running java-gnome either using the -original Proprietary compilers and runtime environments are available from Sun -and others, or using the Libre and Open Java implementation available through -one of the Free runtimes that use the GNU CLASSPATH (aka glibj) project. We -welcome you to deploy java-gnome using either approach. Software Freedom, -after all, is about choice. - -Our build framework, Equivalence, allows you to easily switch between -proprietary and Free compilers and runtimes, allowing you to evaluate -different options. - -Of course, with Sun having recently released their Java VM under the GPL, and -having announced that the full JDK and class libraries will likewise be -released as Free Software, you are most certainly encouraged to make use of -that code as it becomes available. Java Libre! - -4) trademarks and acknowledgements ----------------------------------- - -Java is a trademark of Sun Microsystems, Inc. -GNOME is a trademark of the GNOME Foundation. - -[GPL]: http://www.gnu.org/licenses/ - - diff --git a/manifest-libs b/manifest-libs index 5cda64f..8dfc965 100644 --- a/manifest-libs +++ b/manifest-libs @@ -1 +1 @@ -Class-Path: /usr/share/java/antlr3.jar /usr/share/java/joptsimple.jar /usr/share/java/glossa-interpreter.jar lib/gtk-4.1.jar +Class-Path: /usr/share/java/antlr3.jar /usr/share/java/joptsimple.jar /usr/share/java/glossa-interpreter.jar /usr/share/java/gtk.jar diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 6d04ca4..89a523b 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -12,9 +12,9 @@ is divided into following sections: - execution - debugging - javadoc - - junit compilation - - junit execution - - junit debugging + - test compilation + - test execution + - test debugging - applet - cleanup @@ -54,6 +54,7 @@ is divided into following sections: + @@ -71,10 +72,11 @@ is divided into following sections: - + - - + + + @@ -91,12 +93,6 @@ is divided into following sections: - - - - - - @@ -115,24 +111,12 @@ is divided into following sections: - + - + - - - - - - - - - - - - @@ -156,6 +140,7 @@ is divided into following sections: + @@ -185,7 +170,15 @@ is divided into following sections: - + + + + + + + + + @@ -200,6 +193,27 @@ is divided into following sections: + + + + + + + + + + + + + + + + + + + + + @@ -253,6 +267,7 @@ is divided into following sections: + @@ -292,6 +307,7 @@ is divided into following sections: + @@ -332,11 +348,57 @@ is divided into following sections: - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -344,33 +406,277 @@ is divided into following sections: + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No tests executed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -402,10 +708,13 @@ is divided into following sections: - + Must set JVM to use for profiling in profiler.info.jvm Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + @@ -463,6 +772,7 @@ is divided into following sections: + @@ -479,6 +789,7 @@ is divided into following sections: + @@ -486,6 +797,7 @@ is divided into following sections: + @@ -512,12 +824,15 @@ is divided into following sections: + + + - - + + @@ -529,7 +844,7 @@ is divided into following sections: - + @@ -557,7 +872,7 @@ is divided into following sections: - + - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - - - - - - java -cp "${run.classpath.with.dist.jar}" ${main.class} - - + - + - + - + + + + + + @@ -687,23 +986,41 @@ is divided into following sections: - + To run this application from the command line without Ant, try: java -jar "${dist.jar.resolved}" - + + + + + + + + + + + + + + + + + - + + - + + - + + + This target only works when run from inside the NetBeans IDE. @@ -781,8 +1102,9 @@ is divided into following sections: - + Must select one file in the IDE or set profile.class + This target only works when run from inside the NetBeans IDE. @@ -790,12 +1112,8 @@ is divided into following sections: - - + + This target only works when run from inside the NetBeans IDE. @@ -807,12 +1125,8 @@ is divided into following sections: - - + + This target only works when run from inside the NetBeans IDE. @@ -834,6 +1148,42 @@ is divided into following sections: + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + + + Must select some files in the IDE or set test.includes + + + + + Must select one file in the IDE or set run.class + + + + + Must select one file in the IDE or set applet.url + + + @@ -920,14 +1270,14 @@ is divided into following sections: - + Some tests failed; see details above. @@ -940,39 +1290,40 @@ is divided into following sections: Must select some files in the IDE or set test.includes - + Some tests failed; see details above. + + Must select some files in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + Some tests failed; see details above. + + - + Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - + + + + Must select one file in the IDE or set test.class + Must select some method in the IDE or set test.method + + @@ -1037,9 +1388,12 @@ is divided into following sections: - - - + + + + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index e741a78..77ba71c 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=958a1d3e@1.32.1.45 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=5c3b06b4 -nbproject/build-impl.xml.script.CRC32=b4cf5495 -nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.1.46 +nbproject/build-impl.xml.script.CRC32=88e08eb3 +nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46 diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties index 87e04f5..a21e914 100644 --- a/nbproject/private/private.properties +++ b/nbproject/private/private.properties @@ -4,4 +4,4 @@ do.jar=true javac.debug=true javadoc.preview=true jaxbwiz.endorsed.dirs=/home/cyberpython/apps/netbeans-6.8/ide12/modules/ext/jaxb/api -user.properties.file=/home/cyberpython/.netbeans/7.1.2/build.properties +user.properties.file=/home/cyberpython/.netbeans/7.4/build.properties diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index c1f155a..cd3e03d 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -1,4 +1,8 @@ + + + + diff --git a/nbproject/project.properties b/nbproject/project.properties index 984243a..1779c66 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,3 +1,7 @@ +annotation.processing.enabled=true +annotation.processing.enabled.in.editor=false +annotation.processing.processors.list= +annotation.processing.run.all.processors=true application.title=lingua application.vendor=cyberpython build.classes.dir=${build.dir}/classes @@ -24,19 +28,21 @@ endorsed.classpath= excludes= file.reference.antlr3.jar=/usr/share/java/antlr3.jar file.reference.glossa-interpreter.jar=/usr/share/java/glossa-interpreter.jar -file.reference.gtk-4.1.jar=lib/gtk-4.1.jar +file.reference.gtk.jar=/usr/share/java/gtk.jar file.reference.jopt-simple.jar=/usr/share/java/joptsimple.jar file.reference.libgtkjni-4.1.2-dev.so=lib/libgtkjni-4.1.2-dev.so includes=** jar.compress=false javac.classpath=\ ${file.reference.antlr3.jar}:\ - ${file.reference.gtk-4.1.jar}:\ ${file.reference.glossa-interpreter.jar}:\ - ${file.reference.jopt-simple.jar} + ${file.reference.jopt-simple.jar}:\ + ${file.reference.gtk.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false +javac.processorpath=\ + ${javac.classpath} javac.source=1.5 javac.target=1.5 javac.test.classpath=\ @@ -59,6 +65,7 @@ jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api" main.class=lingua.Main manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF +mkdist.disabled=false platform.active=default_platform run.classpath=\ ${javac.classpath}:\ diff --git a/src/lingua/resources/StringResources.java b/src/lingua/resources/StringResources.java index b06828d..30df683 100644 --- a/src/lingua/resources/StringResources.java +++ b/src/lingua/resources/StringResources.java @@ -40,7 +40,7 @@ public class StringResources { private StringResources() { this.strings = new HashMap(); strings.put("app_name", _("Περιβάλλον Ανάπτυξης Για Τη ΓΛΩΣΣΑ")); - strings.put("app_version", "0.0.5"); + strings.put("app_version", "0.0.6"); strings.put("file", _("_Αρχείο")); strings.put("file_new", _("_Δημιουργία"));