[SCM] TANGO distributed control system. branch, upstream, updated. upstream/7.2.0_rc4-1-gef142b9
Picca Frédéric-Emmanuel
picca at synchrotron-soleil.fr
Thu Oct 21 18:44:26 UTC 2010
The following commit has been merged in the upstream branch:
commit ef142b93141498bd99829cafa552eced950a6d17
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Thu Oct 21 20:35:47 2010 +0200
Imported Upstream version 7.2.0
diff --git a/README b/README
index a976640..ae5eac6 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
==============================================
Jens Meyer (meyer at esrf.fr) - Emmanuel Taurel (taurel at esrf.fr)
-------------------------------------------------------------
- 15/10/2010
+ 20/10/2010
TABLE OF CONTENTS
@@ -176,8 +176,8 @@ The main options for configure are:
[/usr/local]
--enable-static[=PKGS]
build static libraries [default=no]
---disable-java enable installation of Java applications
---disable-dbserver enable installation of Tango database server
+--disable-java disable installation of Java applications
+--disable-dbserver disable installation of Tango database server.
--disable-dbcreate enable an creation of the Tango database schema
--with-java path to java interpreter
@@ -568,10 +568,11 @@ Changes between Tango distribution 7.1.1 and 7.2.0
- Updated TangoTest to Release 1.4.4
- Updated ATKCore and ATKWidget to Release 4.2.3
- Updated atkpanel to Release 4.3
-- Updated Jive to Release 4.11
+- Updated Jive to Release 4.12
- Updated Pogo Release 7.0
- Updated Astor to Release 5.2.9
- Updated TangORB to Release 7.3.5
+- Updated Jdraw to Release 1.13
- Updated Starter to Release 4.14
- Fix SourceForge bugs number 3000308 - 3000310 - 3000329
diff --git a/configure b/configure
index 1da2936..27934e6 100755
--- a/configure
+++ b/configure
@@ -20934,7 +20934,7 @@ ac_config_commands="$ac_config_commands ac_config.h"
subdirs="$subdirs lib/cpp/log4tango"
-ac_config_files="$ac_config_files Makefile lib/Makefile lib/idl/Makefile lib/cpp/tango.pc lib/cpp/Makefile lib/cpp/server/Makefile lib/cpp/server/idl/Makefile lib/cpp/server/jpeg/Makefile lib/cpp/client/Makefile lib/cpp/client/helpers/Makefile lib/java/Makefile cppserver/Makefile cppserver/database/Makefile cppserver/database/create_db.sql cppserver/database/create_db.sh cppserver/database/my.cnf cppserver/database/stored_proc.sql cppserver/database/create_db_tables.sql cppserver/database/update_db.sh cppserver/database/update_db5.sql cppserver/database/update_db6.sql cppserver/starter/Makefile cppserver/tangotest/Makefile cppserver/AbstractClass/Makefile cppserver/tangoaccesscontrol/Makefile utils/Makefile utils/notifd2db/Makefile utils/tango_admin/Makefile scripts/Makefile scripts/jive scripts/logviewer scripts/TangoVers scripts/astor scripts/atkpanel scripts/atktuning scripts/pogo-6 scripts/pogo scripts/cvstag scripts/tg_devtest scripts/tango scripts/tango_wca scripts/devicetree scripts/jdraw scripts/synopticappli scripts/atkmoni scripts/notify_daemon doc/Makefile doc/man/Makefile pogo/preferences/tango.opt pogo/preferences/Pogo.site_properties pogo/Makefile pogo/templates/Makefile pogo/templates/cpp/Makefile"
+ac_config_files="$ac_config_files Makefile lib/Makefile lib/idl/Makefile lib/cpp/tango.pc lib/cpp/Makefile lib/cpp/server/Makefile lib/cpp/server/idl/Makefile lib/cpp/server/jpeg/Makefile lib/cpp/client/Makefile lib/cpp/client/helpers/Makefile lib/java/Makefile lib/java/jive lib/java/logviewer lib/java/TangoVers lib/java/astor lib/java/atkpanel lib/java/atktuning lib/java/pogo-6 lib/java/pogo lib/java/cvstag lib/java/tg_devtest lib/java/devicetree lib/java/jdraw lib/java/synopticappli lib/java/atkmoni cppserver/Makefile cppserver/database/Makefile cppserver/database/create_db.sql cppserver/database/create_db.sh cppserver/database/my.cnf cppserver/database/stored_proc.sql cppserver/database/create_db_tables.sql cppserver/database/update_db.sh cppserver/database/update_db5.sql cppserver/database/update_db6.sql cppserver/starter/Makefile cppserver/tangotest/Makefile cppserver/AbstractClass/Makefile cppserver/tangoaccesscontrol/Makefile utils/Makefile utils/notifd2db/Makefile utils/tango_admin/Makefile scripts/Makefile scripts/tango scripts/tango_wca scripts/notify_daemon doc/Makefile doc/man/Makefile pogo/preferences/tango.opt pogo/preferences/Pogo.site_properties pogo/Makefile pogo/templates/Makefile pogo/templates/cpp/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -21970,6 +21970,20 @@ do
"lib/cpp/client/Makefile") CONFIG_FILES="$CONFIG_FILES lib/cpp/client/Makefile" ;;
"lib/cpp/client/helpers/Makefile") CONFIG_FILES="$CONFIG_FILES lib/cpp/client/helpers/Makefile" ;;
"lib/java/Makefile") CONFIG_FILES="$CONFIG_FILES lib/java/Makefile" ;;
+ "lib/java/jive") CONFIG_FILES="$CONFIG_FILES lib/java/jive" ;;
+ "lib/java/logviewer") CONFIG_FILES="$CONFIG_FILES lib/java/logviewer" ;;
+ "lib/java/TangoVers") CONFIG_FILES="$CONFIG_FILES lib/java/TangoVers" ;;
+ "lib/java/astor") CONFIG_FILES="$CONFIG_FILES lib/java/astor" ;;
+ "lib/java/atkpanel") CONFIG_FILES="$CONFIG_FILES lib/java/atkpanel" ;;
+ "lib/java/atktuning") CONFIG_FILES="$CONFIG_FILES lib/java/atktuning" ;;
+ "lib/java/pogo-6") CONFIG_FILES="$CONFIG_FILES lib/java/pogo-6" ;;
+ "lib/java/pogo") CONFIG_FILES="$CONFIG_FILES lib/java/pogo" ;;
+ "lib/java/cvstag") CONFIG_FILES="$CONFIG_FILES lib/java/cvstag" ;;
+ "lib/java/tg_devtest") CONFIG_FILES="$CONFIG_FILES lib/java/tg_devtest" ;;
+ "lib/java/devicetree") CONFIG_FILES="$CONFIG_FILES lib/java/devicetree" ;;
+ "lib/java/jdraw") CONFIG_FILES="$CONFIG_FILES lib/java/jdraw" ;;
+ "lib/java/synopticappli") CONFIG_FILES="$CONFIG_FILES lib/java/synopticappli" ;;
+ "lib/java/atkmoni") CONFIG_FILES="$CONFIG_FILES lib/java/atkmoni" ;;
"cppserver/Makefile") CONFIG_FILES="$CONFIG_FILES cppserver/Makefile" ;;
"cppserver/database/Makefile") CONFIG_FILES="$CONFIG_FILES cppserver/database/Makefile" ;;
"cppserver/database/create_db.sql") CONFIG_FILES="$CONFIG_FILES cppserver/database/create_db.sql" ;;
@@ -21988,22 +22002,8 @@ do
"utils/notifd2db/Makefile") CONFIG_FILES="$CONFIG_FILES utils/notifd2db/Makefile" ;;
"utils/tango_admin/Makefile") CONFIG_FILES="$CONFIG_FILES utils/tango_admin/Makefile" ;;
"scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
- "scripts/jive") CONFIG_FILES="$CONFIG_FILES scripts/jive" ;;
- "scripts/logviewer") CONFIG_FILES="$CONFIG_FILES scripts/logviewer" ;;
- "scripts/TangoVers") CONFIG_FILES="$CONFIG_FILES scripts/TangoVers" ;;
- "scripts/astor") CONFIG_FILES="$CONFIG_FILES scripts/astor" ;;
- "scripts/atkpanel") CONFIG_FILES="$CONFIG_FILES scripts/atkpanel" ;;
- "scripts/atktuning") CONFIG_FILES="$CONFIG_FILES scripts/atktuning" ;;
- "scripts/pogo-6") CONFIG_FILES="$CONFIG_FILES scripts/pogo-6" ;;
- "scripts/pogo") CONFIG_FILES="$CONFIG_FILES scripts/pogo" ;;
- "scripts/cvstag") CONFIG_FILES="$CONFIG_FILES scripts/cvstag" ;;
- "scripts/tg_devtest") CONFIG_FILES="$CONFIG_FILES scripts/tg_devtest" ;;
"scripts/tango") CONFIG_FILES="$CONFIG_FILES scripts/tango" ;;
"scripts/tango_wca") CONFIG_FILES="$CONFIG_FILES scripts/tango_wca" ;;
- "scripts/devicetree") CONFIG_FILES="$CONFIG_FILES scripts/devicetree" ;;
- "scripts/jdraw") CONFIG_FILES="$CONFIG_FILES scripts/jdraw" ;;
- "scripts/synopticappli") CONFIG_FILES="$CONFIG_FILES scripts/synopticappli" ;;
- "scripts/atkmoni") CONFIG_FILES="$CONFIG_FILES scripts/atkmoni" ;;
"scripts/notify_daemon") CONFIG_FILES="$CONFIG_FILES scripts/notify_daemon" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"doc/man/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/Makefile" ;;
diff --git a/configure.in b/configure.in
index 685aea1..0ff861f 100644
--- a/configure.in
+++ b/configure.in
@@ -399,6 +399,20 @@ AC_OUTPUT(Makefile
lib/cpp/client/Makefile
lib/cpp/client/helpers/Makefile
lib/java/Makefile
+ lib/java/jive
+ lib/java/logviewer
+ lib/java/TangoVers
+ lib/java/astor
+ lib/java/atkpanel
+ lib/java/atktuning
+ lib/java/pogo-6
+ lib/java/pogo
+ lib/java/cvstag
+ lib/java/tg_devtest
+ lib/java/devicetree
+ lib/java/jdraw
+ lib/java/synopticappli
+ lib/java/atkmoni
cppserver/Makefile
cppserver/database/Makefile
cppserver/database/create_db.sql
@@ -417,22 +431,8 @@ AC_OUTPUT(Makefile
utils/notifd2db/Makefile
utils/tango_admin/Makefile
scripts/Makefile
- scripts/jive
- scripts/logviewer
- scripts/TangoVers
- scripts/astor
- scripts/atkpanel
- scripts/atktuning
- scripts/pogo-6
- scripts/pogo
- scripts/cvstag
- scripts/tg_devtest
scripts/tango
scripts/tango_wca
- scripts/devicetree
- scripts/jdraw
- scripts/synopticappli
- scripts/atkmoni
scripts/notify_daemon
doc/Makefile
doc/man/Makefile
diff --git a/cppserver/starter/StartProcessThread.cpp b/cppserver/starter/StartProcessThread.cpp
old mode 100755
new mode 100644
diff --git a/lib/cpp/log4tango/COPYING b/lib/cpp/log4tango/COPYING
index 94a9ed0..fc8a5de 100644
--- a/lib/cpp/log4tango/COPYING
+++ b/lib/cpp/log4tango/COPYING
@@ -1,674 +1,165 @@
- GNU GENERAL PUBLIC LICENSE
+ GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/lib/cpp/log4tango/tests/clock.cpp b/lib/cpp/log4tango/tests/clock.cpp
index 14ab6ed..b1b0541 100755
--- a/lib/cpp/log4tango/tests/clock.cpp
+++ b/lib/cpp/log4tango/tests/clock.cpp
@@ -1,4 +1,4 @@
-static const char rcsid[] = "$Id: clock.cpp,v 1.1 2003/03/11 17:21:14 nleclercq Exp $";
+static const char rcsid[] = "$Id: clock.cpp,v 1.2 2010/10/19 15:20:37 taurel Exp $";
//
// Copyright (C) : 2004,2005,2006,2007,2008,2009,2010
diff --git a/lib/java/Jive-4.11.jar b/lib/java/Jive-4.12.jar
similarity index 84%
rename from lib/java/Jive-4.11.jar
rename to lib/java/Jive-4.12.jar
index 441967e..e499966 100644
Binary files a/lib/java/Jive-4.11.jar and b/lib/java/Jive-4.12.jar differ
diff --git a/lib/java/Makefile.am b/lib/java/Makefile.am
index c4dcc83..f2339f4 100644
--- a/lib/java/Makefile.am
+++ b/lib/java/Makefile.am
@@ -7,7 +7,7 @@ dist_java_DATA=\
Astor-5.2.10.jar \
DeviceTree-1.8.jar \
ATKCore-4.2.3.jar \
- Jive-4.11.jar \
+ Jive-4.12.jar \
org.tango.pogo-7.0.0.jar \
atkpanel-4.3.jar \
log4j-1.2.15.jar \
@@ -17,6 +17,38 @@ dist_java_DATA=\
ATKWidget-4.2.3.jar \
tool_panels-1.9.jar
+if TANGO_JAVA_ENABLED
+bin_SCRIPTS = \
+ astor \
+ jive \
+ pogo \
+ pogo-6 \
+ devicetree \
+ atkpanel \
+ logviewer \
+ atktuning \
+ jdraw \
+ synopticappli \
+ atkmoni \
+ cvstag
+endif
+
+# Make sure that all these go into the dist.
+EXTRA_DIST = \
+ astor.in \
+ jive.in \
+ pogo.in \
+ pogo-6.in \
+ devicetree.in \
+ atkpanel.in \
+ logviewer.in \
+ atktuning.in \
+ jdraw.in \
+ synopticappli.in \
+ atkmoni.in \
+ cvstag.in
+
+
# Even though we do not want to compile anything in the
# java-directory, we still want to install the sources in
# prefix/share/tango
@@ -30,7 +62,7 @@ install-data-hook:
$(LN_S) ATKWidget* ATKWidget.jar && \
$(LN_S) DeviceTree* DeviceTree.jar && \
$(LN_S) Jive* Jive.jar && \
- $(LN_S) log4j* log4j.jar && \
+ $(LN_S) log4j* log4j-1.2.jar && \
$(LN_S) LogViewer* LogViewer.jar && \
$(LN_S) org.tango.pogo* org.tango.pogo.jar && \
$(LN_S) TangORB* TangORB.jar && \
diff --git a/lib/java/Makefile.in b/lib/java/Makefile.in
index 9660e97..cd5630c 100644
--- a/lib/java/Makefile.in
+++ b/lib/java/Makefile.in
@@ -18,6 +18,7 @@
# make sure it is in the dist. Don't use EXTRA_DIST. It will copy
# the link instead of keeping them as links
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -38,7 +39,12 @@ build_triplet = @build@
host_triplet = @host@
subdir = lib/java
DIST_COMMON = README $(dist_java_DATA) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+ $(srcdir)/Makefile.in $(srcdir)/TangoVers.in \
+ $(srcdir)/astor.in $(srcdir)/atkmoni.in $(srcdir)/atkpanel.in \
+ $(srcdir)/atktuning.in $(srcdir)/cvstag.in \
+ $(srcdir)/devicetree.in $(srcdir)/jdraw.in $(srcdir)/jive.in \
+ $(srcdir)/logviewer.in $(srcdir)/pogo-6.in $(srcdir)/pogo.in \
+ $(srcdir)/synopticappli.in $(srcdir)/tg_devtest.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/RSSH_CHECK_OMNIORB.m4 \
$(top_srcdir)/m4/RSSH_CHECK_PTHREADS.m4 \
@@ -58,7 +64,12 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/ac_config.h.tmp
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = jive logviewer TangoVers astor atkpanel atktuning \
+ pogo-6 pogo cvstag tg_devtest devicetree jdraw synopticappli \
+ atkmoni
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(javadir)"
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(bin_SCRIPTS)
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -67,7 +78,6 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(javadir)"
dist_javaDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_java_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -247,7 +257,7 @@ dist_java_DATA = \
Astor-5.2.10.jar \
DeviceTree-1.8.jar \
ATKCore-4.2.3.jar \
- Jive-4.11.jar \
+ Jive-4.12.jar \
org.tango.pogo-7.0.0.jar \
atkpanel-4.3.jar \
log4j-1.2.15.jar \
@@ -257,6 +267,36 @@ dist_java_DATA = \
ATKWidget-4.2.3.jar \
tool_panels-1.9.jar
+ at TANGO_JAVA_ENABLED_TRUE@bin_SCRIPTS = \
+ at TANGO_JAVA_ENABLED_TRUE@ astor \
+ at TANGO_JAVA_ENABLED_TRUE@ jive \
+ at TANGO_JAVA_ENABLED_TRUE@ pogo \
+ at TANGO_JAVA_ENABLED_TRUE@ pogo-6 \
+ at TANGO_JAVA_ENABLED_TRUE@ devicetree \
+ at TANGO_JAVA_ENABLED_TRUE@ atkpanel \
+ at TANGO_JAVA_ENABLED_TRUE@ logviewer \
+ at TANGO_JAVA_ENABLED_TRUE@ atktuning \
+ at TANGO_JAVA_ENABLED_TRUE@ jdraw \
+ at TANGO_JAVA_ENABLED_TRUE@ synopticappli \
+ at TANGO_JAVA_ENABLED_TRUE@ atkmoni \
+ at TANGO_JAVA_ENABLED_TRUE@ cvstag
+
+
+# Make sure that all these go into the dist.
+EXTRA_DIST = \
+ astor.in \
+ jive.in \
+ pogo.in \
+ pogo-6.in \
+ devicetree.in \
+ atkpanel.in \
+ logviewer.in \
+ atktuning.in \
+ jdraw.in \
+ synopticappli.in \
+ atkmoni.in \
+ cvstag.in
+
all: all-am
.SUFFIXES:
@@ -289,6 +329,53 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+jive: $(top_builddir)/config.status $(srcdir)/jive.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+logviewer: $(top_builddir)/config.status $(srcdir)/logviewer.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+TangoVers: $(top_builddir)/config.status $(srcdir)/TangoVers.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+astor: $(top_builddir)/config.status $(srcdir)/astor.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+atkpanel: $(top_builddir)/config.status $(srcdir)/atkpanel.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+atktuning: $(top_builddir)/config.status $(srcdir)/atktuning.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+pogo-6: $(top_builddir)/config.status $(srcdir)/pogo-6.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+pogo: $(top_builddir)/config.status $(srcdir)/pogo.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+cvstag: $(top_builddir)/config.status $(srcdir)/cvstag.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+tg_devtest: $(top_builddir)/config.status $(srcdir)/tg_devtest.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+devicetree: $(top_builddir)/config.status $(srcdir)/devicetree.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+jdraw: $(top_builddir)/config.status $(srcdir)/jdraw.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+synopticappli: $(top_builddir)/config.status $(srcdir)/synopticappli.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+atkmoni: $(top_builddir)/config.status $(srcdir)/atkmoni.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-binSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ done
mostlyclean-libtool:
-rm -f *.lo
@@ -347,9 +434,9 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(DATA)
+all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(javadir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(javadir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -400,7 +487,7 @@ install-data-am: install-dist_javaDATA
install-dvi: install-dvi-am
-install-exec-am:
+install-exec-am: install-binSCRIPTS
install-html: install-html-am
@@ -430,21 +517,22 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_javaDATA
+uninstall-am: uninstall-binSCRIPTS uninstall-dist_javaDATA
.MAKE: install-am install-data-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-data-hook \
- install-dist_javaDATA install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ install-binSCRIPTS install-data install-data-am \
+ install-data-hook install-dist_javaDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-am uninstall-binSCRIPTS \
uninstall-dist_javaDATA
@@ -461,7 +549,7 @@ install-data-hook:
$(LN_S) ATKWidget* ATKWidget.jar && \
$(LN_S) DeviceTree* DeviceTree.jar && \
$(LN_S) Jive* Jive.jar && \
- $(LN_S) log4j* log4j.jar && \
+ $(LN_S) log4j* log4j-1.2.jar && \
$(LN_S) LogViewer* LogViewer.jar && \
$(LN_S) org.tango.pogo* org.tango.pogo.jar && \
$(LN_S) TangORB* TangORB.jar && \
diff --git a/scripts/TangoVers.in b/lib/java/TangoVers.in
similarity index 100%
rename from scripts/TangoVers.in
rename to lib/java/TangoVers.in
diff --git a/scripts/astor.in b/lib/java/astor.in
similarity index 97%
rename from scripts/astor.in
rename to lib/java/astor.in
index ebacb36..cc20b2c 100755
--- a/scripts/astor.in
+++ b/lib/java/astor.in
@@ -49,7 +49,7 @@ TANGO_CLASS=$LIB_DIR/TangORB.jar; export TANGO_CLASS
ASTOR_CLASS=$LIB_DIR/Astor.jar; export ASTOR_CLASS
JIVE_CLASS=$LIB_DIR/Jive.jar; export JIVE_CLASS
LOGVIEWER=$LIB_DIR/LogViewer.jar; export LOGVIEWER
-LOG4J=$LIB_DIR/log4j.jar; export LOG4J
+LOG4J=$LIB_DIR/log4j-1.2.jar; export LOG4J
ATK_CLASS=$LIB_DIR/ATKCore.jar:$LIB_DIR/ATKWidget.jar
ATK_CLASS=$ATK_CLASS:$APP_DIR/atkpanel.jar:$APP_DIR/tool_panels.jar
diff --git a/scripts/atkmoni.in b/lib/java/atkmoni.in
similarity index 100%
rename from scripts/atkmoni.in
rename to lib/java/atkmoni.in
diff --git a/lib/java/atkpanel-4.3.jar b/lib/java/atkpanel-4.3.jar
index 6d3e1fa..51c4e9f 100644
Binary files a/lib/java/atkpanel-4.3.jar and b/lib/java/atkpanel-4.3.jar differ
diff --git a/scripts/atkpanel.in b/lib/java/atkpanel.in
similarity index 100%
rename from scripts/atkpanel.in
rename to lib/java/atkpanel.in
diff --git a/scripts/atktuning.in b/lib/java/atktuning.in
similarity index 100%
rename from scripts/atktuning.in
rename to lib/java/atktuning.in
diff --git a/scripts/cvstag.in b/lib/java/cvstag.in
similarity index 100%
rename from scripts/cvstag.in
rename to lib/java/cvstag.in
diff --git a/scripts/devicetree.in b/lib/java/devicetree.in
similarity index 100%
rename from scripts/devicetree.in
rename to lib/java/devicetree.in
diff --git a/scripts/jdraw.in b/lib/java/jdraw.in
similarity index 100%
rename from scripts/jdraw.in
rename to lib/java/jdraw.in
diff --git a/scripts/jive.in b/lib/java/jive.in
similarity index 100%
rename from scripts/jive.in
rename to lib/java/jive.in
diff --git a/scripts/logviewer.in b/lib/java/logviewer.in
similarity index 84%
rename from scripts/logviewer.in
rename to lib/java/logviewer.in
index ad8b435..a2f3260 100755
--- a/scripts/logviewer.in
+++ b/lib/java/logviewer.in
@@ -13,7 +13,7 @@ JAVABIN=@DATADIR@/java;
ATKBIN=@DATADIR@/java;
TLVBIN=@DATADIR@/java;
-ATKJAR=$ATKBIN/ATKCore.jar:$ATKBIN/ATKWidget.jar:$ATKBIN/log4j.jar
+ATKJAR=$ATKBIN/ATKCore.jar:$ATKBIN/ATKWidget.jar:$ATKBIN/log4j-1.2.jar
CLASSPATH=$JAVALIB/TangORB.jar:$TLVBIN/LogViewer.jar:$ATKJAR:.
export CLASSPATH
diff --git a/scripts/pogo-6.in b/lib/java/pogo-6.in
similarity index 100%
rename from scripts/pogo-6.in
rename to lib/java/pogo-6.in
diff --git a/scripts/pogo.in b/lib/java/pogo.in
similarity index 100%
rename from scripts/pogo.in
rename to lib/java/pogo.in
diff --git a/scripts/synopticappli.in b/lib/java/synopticappli.in
similarity index 100%
rename from scripts/synopticappli.in
rename to lib/java/synopticappli.in
diff --git a/scripts/tg_devtest.in b/lib/java/tg_devtest.in
similarity index 100%
rename from scripts/tg_devtest.in
rename to lib/java/tg_devtest.in
diff --git a/pogo/preferences/tango.opt.in b/pogo/preferences/tango.opt.in
index eb0317c..6bdeef4 100644
--- a/pogo/preferences/tango.opt.in
+++ b/pogo/preferences/tango.opt.in
@@ -9,7 +9,7 @@ endif
#-- OMNI_HOME
#------------------------------------------------------------------------------
ifndef OMNI_HOME
- OMNI_HOME = $(TANGO_HOME)
+ OMNI_HOME = @ORB_PREFIX@
endif
#------------------------------------------------------------------------------
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 3c0b0c9..66f897c 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -3,22 +3,5 @@
bin_SCRIPTS = notify_daemon
if TANGO_DB_SERVER_ENABLED
-bin_SCRIPTS += tango
-bin_SCRIPTS += tango_wca
+bin_SCRIPTS += tango tango_wca
endif
-
-if TANGO_JAVA_ENABLED
-bin_SCRIPTS += astor jive pogo pogo-6 devicetree TangoVers tg_devtest \
- atkpanel logviewer atktuning jdraw synopticappli \
- atkmoni cvstag
-endif
-
-# Make sure that all these go into the dist.
-EXTRA_DIST = tango.in tango_wca.in astor.in jive.in pogo.in pogo-6.in devicetree.in TangoVers.in \
- tg_devtest.in atkpanel.in logviewer.in atktuning.in jdraw.in \
- synopticappli.in atkmoni.in cvstag.in notify_daemon.in
-
-#dist-hook:
-# for file in $(SCRIPTS_IN); do \
-# cp $(srcdir)/$$file $(distdir)/$$file; \
-# done;
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index ff35877..422cdca 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -35,20 +35,10 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@TANGO_DB_SERVER_ENABLED_TRUE at am__append_1 = tango tango_wca
- at TANGO_JAVA_ENABLED_TRUE@am__append_2 = astor jive pogo pogo-6 devicetree TangoVers tg_devtest \
- at TANGO_JAVA_ENABLED_TRUE@ atkpanel logviewer atktuning jdraw synopticappli \
- at TANGO_JAVA_ENABLED_TRUE@ atkmoni cvstag
-
subdir = scripts
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/TangoVers.in $(srcdir)/astor.in $(srcdir)/atkmoni.in \
- $(srcdir)/atkpanel.in $(srcdir)/atktuning.in \
- $(srcdir)/cvstag.in $(srcdir)/devicetree.in $(srcdir)/jdraw.in \
- $(srcdir)/jive.in $(srcdir)/logviewer.in \
- $(srcdir)/notify_daemon.in $(srcdir)/pogo-6.in \
- $(srcdir)/pogo.in $(srcdir)/synopticappli.in \
- $(srcdir)/tango.in $(srcdir)/tango_wca.in \
- $(srcdir)/tg_devtest.in
+ $(srcdir)/notify_daemon.in $(srcdir)/tango.in \
+ $(srcdir)/tango_wca.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/RSSH_CHECK_OMNIORB.m4 \
$(top_srcdir)/m4/RSSH_CHECK_PTHREADS.m4 \
@@ -68,9 +58,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/ac_config.h.tmp
-CONFIG_CLEAN_FILES = jive logviewer TangoVers astor atkpanel atktuning \
- pogo-6 pogo cvstag tg_devtest tango tango_wca devicetree jdraw \
- synopticappli atkmoni notify_daemon
+CONFIG_CLEAN_FILES = tango tango_wca notify_daemon
am__installdirs = "$(DESTDIR)$(bindir)"
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS)
@@ -248,13 +236,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-bin_SCRIPTS = notify_daemon $(am__append_1) $(am__append_2)
-
-# Make sure that all these go into the dist.
-EXTRA_DIST = tango.in tango_wca.in astor.in jive.in pogo.in pogo-6.in devicetree.in TangoVers.in \
- tg_devtest.in atkpanel.in logviewer.in atktuning.in jdraw.in \
- synopticappli.in atkmoni.in cvstag.in notify_daemon.in
-
+bin_SCRIPTS = notify_daemon $(am__append_1)
all: all-am
.SUFFIXES:
@@ -287,38 +269,10 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-jive: $(top_builddir)/config.status $(srcdir)/jive.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-logviewer: $(top_builddir)/config.status $(srcdir)/logviewer.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-TangoVers: $(top_builddir)/config.status $(srcdir)/TangoVers.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-astor: $(top_builddir)/config.status $(srcdir)/astor.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-atkpanel: $(top_builddir)/config.status $(srcdir)/atkpanel.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-atktuning: $(top_builddir)/config.status $(srcdir)/atktuning.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-pogo-6: $(top_builddir)/config.status $(srcdir)/pogo-6.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-pogo: $(top_builddir)/config.status $(srcdir)/pogo.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-cvstag: $(top_builddir)/config.status $(srcdir)/cvstag.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-tg_devtest: $(top_builddir)/config.status $(srcdir)/tg_devtest.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
tango: $(top_builddir)/config.status $(srcdir)/tango.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
tango_wca: $(top_builddir)/config.status $(srcdir)/tango_wca.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-devicetree: $(top_builddir)/config.status $(srcdir)/devicetree.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-jdraw: $(top_builddir)/config.status $(srcdir)/jdraw.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-synopticappli: $(top_builddir)/config.status $(srcdir)/synopticappli.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-atkmoni: $(top_builddir)/config.status $(srcdir)/atkmoni.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
notify_daemon: $(top_builddir)/config.status $(srcdir)/notify_daemon.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-binSCRIPTS: $(bin_SCRIPTS)
@@ -478,11 +432,6 @@ uninstall-am: uninstall-binSCRIPTS
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall uninstall-am uninstall-binSCRIPTS
-
-#dist-hook:
-# for file in $(SCRIPTS_IN); do \
-# cp $(srcdir)/$$file $(distdir)/$$file; \
-# done;
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--
TANGO distributed control system.
More information about the debian-science-commits
mailing list