debian/0000755000000000000000000000000012103757650007174 5ustar debian/changelog0000644000000000000000000001423712103757455011060 0ustar polyorb (2.8~20110207-5.1) unstable; urgency=low * Non-maintainer upload with maintainer approval. * libpolyorb2-dev: Add Conflicts/Replaces: libpolyorb1-dev due to file conflict on /usr/bin/iac. (Closes: #699197) * libpolyorb3.postinst: Cleanup the diversion created by 2.8~20110207-[34]. (Closes: #692780) -- Andreas Beckmann Mon, 04 Feb 2013 17:17:05 +0100 polyorb (2.8~20110207-5) unstable; urgency=low * remove diversion of manpage polyorb.7 the man page isn't put in any package since it contains general information not very usefull Closes: #688299 -- Xavier Grave Sat, 29 Sep 2012 09:48:41 +0200 polyorb (2.8~20110207-4) unstable; urgency=low * remove the testsuite run as part of the build one can still use the run_testsuite target if necessary Closes: #674098 Closes: #676747 * remove kfreebsd-* architectures to prevent FTBFS -- Xavier Grave Wed, 13 Jun 2012 22:02:25 +0200 polyorb (2.8~20110207-3) unstable; urgency=low * divert polyorb.7 manpage in libpolyorb3 both packages needs this manpage related to configuration both packages can coexist Closes: #673982 * fix lintian error about object files in doc package -- Xavier Grave Thu, 31 May 2012 14:31:02 +0200 polyorb (2.8~20110207-2) unstable; urgency=low [Nicolas Boulenguez] * use dh-ada-library - simplify debian/rules compute -j option * use gnatgcc instead of gcc [Xavier Grave] * fix FTBFS on all architectures python-gnatpython moved to Build-Depends instead of Build-Depends-Indep * hardening (lintian warnings) removed 40 warnings, still some warnings -- Xavier Grave Tue, 22 May 2012 10:30:50 +0200 polyorb (2.8~20110207-1) unstable; urgency=low [Xavier Grave] * new upstream version : 2.8~20110207 (Subversion revision 170156) chosen because it immediately precedes a change of System.Partition_Interface.PCS_Version, which requires gnat > 4.6. - use 0f4393e4f6d42f8d093a29b8fa35aebf4eb4a5f4 from com.adacore.polyorb.debian * patches adaptation - adapt and remove some patches * Build with gnat-4.6. Closes: #642825. * Debhelper compatibility level 8. * Take new gcc-multilib scheme into account - put libs in /usr/lib/$(DEB_HOST_MULTIHARCH) - modify control file accordingly * take new testsuite scheme into account - remove some CORBA broken patches SHUTDOWN_1 ALL_TYPES_2 ALL_TYPES_3 ALL_FUNCTIONS_2 ALL_FUNCTIONS_3 [Reto Buerki] * Drop bug-575954.patch (fixed in gnat 4.6) -- Xavier Grave Wed, 16 May 2012 11:11:46 +0200 polyorb (2.6.0~20090423-10) unstable; urgency=low * Fix "bashism in /bin/sh script" - echo -e "y\ny" was replaced by printf "y\ny\n" in the three .in files done in patch bug-581134.patch (Closes: #581134) -- Xavier Grave Sun, 16 May 2010 19:46:58 +0200 polyorb (2.6.0~20090423-9) unstable; urgency=low * Use configurable number of build processes (Closes: #575336). * Switch to dpkg-source 3.0 (quilt) format. -- Reto Buerki Tue, 06 Apr 2010 08:57:51 +0200 polyorb (2.6.0~20090423-8) unstable; urgency=low * 2.6.0~20090423-6 reached testing * Fix typo in changelog to really close #573174 bug Closes: #573174. -- Xavier Grave Wed, 24 Mar 2010 14:05:36 +0100 polyorb (2.6.0~20090423-7) experimental; urgency=low * Apply a patch to backport NF-27-IC22-022 from 2.7 version This patch allow users to use -gnaty option without it applying to the code generated by po_gnatdist Close: #573174. * Move po_gnatdist from polyorb-servers package to libpolyorb1-dev - po_gnatdist isn't a server, it's a compiler tool -- Xavier Grave Tue, 09 Mar 2010 23:31:36 +0100 polyorb (2.6.0~20090423-6) unstable; urgency=low [Reto Buerki] * Disable CORBA/MIOP test (Closes: #568814, #571436). [Ludovic Brenta] * debian/control (DM-Upload-Allowed): yes. -- Reto Buerki Thu, 04 Mar 2010 20:51:55 +0100 polyorb (2.6.0~20090423-5) unstable; urgency=low * Use 127.0.0.1 as iiop default_addr in tests (Closes: #562342). * Update to Standards-Version 3.8.4 (no changes). -- Reto Buerki Fri, 29 Jan 2010 00:11:49 +0100 polyorb (2.6.0~20090423-4) unstable; urgency=low [Xavier Grave] * debian/patches/bug-562192.patch: new; remove -fcheck-stack option Closes: #562192. -- Xavier Grave Tue, 26 Jan 2010 18:44:00 +0100 polyorb (2.6.0~20090423-3) unstable; urgency=low [Reto Buerki] * debian/patches/testsuite-combined-output.patch: new; send test output to both stdout and a file so we can examine failures in the buildd logs. * debian/control: Fix debhelper-but-no-misc-depends lintian warning. [Ludovic Brenta] * debian/control (Build-Depends): tighten to gnat-4.4 (>= 4.4.2-6). Closes: #561156. [Xavier Grave] * debian/patches/bug-561121.patch: new; compile xe.adb with -O1 instead of -O2 to fix FTBFS on sparc. Closes: #561121. -- Ludovic Brenta Tue, 19 Jan 2010 23:07:28 +0100 polyorb (2.6.0~20090423-2) unstable; urgency=low * Add ia64 to Architecture (Closes: #561223). * Add python to Build-Depends (Closes: #561158). -- Reto Buerki Sat, 19 Dec 2009 22:35:59 +0100 polyorb (2.6.0~20090423-1) unstable; urgency=low [Xavier Grave, Reto Buerki] * Initial release (Closes: #517404) based on the upstream subversion revision r144260, date 2009-04-23. Revisions after that (such as PolyORB GPL 2009 Edition) require gnat-4.5 which is not yet available. * Enabled application personalities in this upload: MOMA: Message-Oriented Middleware Architecture CORBA: Common Object Request Broker Architecture DSA: Ada Distributed Systems Annex (see README.Debian) [Ludovic Brenta] * Sponsor the package. * Split the package building into arch-dependent and arch-independent parts. -- Ludovic Brenta Sat, 12 Dec 2009 09:59:10 +0100 debian/libpolyorb3.postinst0000644000000000000000000000036212103370136013230 0ustar #! /bin/sh set -e if [ "$1" = "configure" ]; then # remove the diversion created by libpolyorb3 2.8~20110207-3 and 2.8~20110207-4 dpkg-divert --quiet --package libpolyorb3 --remove --rename /usr/share/man/man7/polyorb.7.gz fi #DEBHELPER# debian/control0000644000000000000000000001033012103367316010570 0ustar Source: polyorb Section: net Priority: optional Maintainer: Xavier Grave Uploaders: Ludovic Brenta DM-Upload-Allowed: yes Build-Depends: debhelper (>= 8.9.7), dpkg-dev (>= 1.16.1), dh-ada-library, python-gnatpython, automake, autotools-dev, libtool, gnat, gnat-4.6, python Build-Depends-Indep: ghostscript, texi2html, texlive-formats-extra, texlive-generic-recommended, transfig, texinfo Standards-Version: 3.9.3 Vcs-Browser: http://www.ada-france.org:8081/branch/changes/org.debian.polyorb Vcs-Mtn: www.ada-france.org org.debian.polyorb Homepage: http://libre.adacore.com/libre/tools/polyorb/ Package: polyorb-servers Architecture: amd64 hppa i386 ia64 mips mipsel powerpc ppc64 s390 sparc Depends: ${shlibs:Depends}, ${misc:Depends} Description: Multiple-personality middleware for Ada (servers) PolyORB provides a uniform solution to build distributed applications; relying either on industrial-strength middleware standards such as CORBA, the Distributed System Annex of Ada 95, distribution programming paradigms such as Web Services, Message Oriented Middleware (MOM), or to implement application-specific middleware. . This package provides various middleware servers needed to run a distributed application and tools to interact with these servers. Package: libpolyorb2-dev Section: libdevel Architecture: amd64 hppa i386 ia64 mips mipsel powerpc ppc64 s390 sparc Depends: ${misc:Depends}, ${shlibs:Depends}, libpolyorb3 (= ${binary:Version}), g++, gnat-4.6 Conflicts: libpolyorb1-dev, libpolyorb2-dev Replaces: libpolyorb1-dev, libpolyorb2-dev Recommends: polyorb-servers (= ${binary:Version}) Description: Multiple-personality middleware for Ada (development) PolyORB provides a uniform solution to build distributed applications; relying either on industrial-strength middleware standards such as CORBA, the Distributed System Annex of Ada 95, distribution programming paradigms such as Web Services, Message Oriented Middleware (MOM), or to implement application-specific middleware. . This package provides the development files and utilities necessary to develop distributed applications using PolyORB. . Distributed applications will also require the polyorb-servers package but not necessarily on the same machine. Package: libpolyorb3 Section: libs Architecture: amd64 hppa i386 ia64 mips mipsel powerpc ppc64 s390 sparc Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: same Recommends: polyorb-servers (= ${binary:Version}) Description: Multiple-personality middleware for Ada PolyORB provides a uniform solution to build distributed applications; relying either on industrial-strength middleware standards such as CORBA, the Distributed System Annex of Ada 95, distribution programming paradigms such as Web Services, Message Oriented Middleware (MOM), or to implement application-specific middleware. . Distributed applications will also require the polyorb-servers package but not necessarily on the same machine. Package: polyorb-doc Section: doc Architecture: all Depends: ${misc:Depends} Recommends: libpolyorb2-dev (= ${binary:Version}) Description: Multiple-personality middleware for Ada (documentation) PolyORB provides a uniform solution to build distributed applications; relying either on industrial-strength middleware standards such as CORBA, the Distributed System Annex of Ada 95, distribution programming paradigms such as Web Services, Message Oriented Middleware (MOM), or to implement application-specific middleware. . This package contains the documentation and examples. Package: libpolyorb-dbg Section: debug Priority: extra Architecture: amd64 hppa i386 ia64 mips mipsel powerpc ppc64 s390 sparc Depends: ${misc:Depends}, libpolyorb3 (= ${binary:Version}), libpolyorb2-dev (= ${binary:Version}) Description: Multiple-personality middleware for Ada (debug) PolyORB provides a uniform solution to build distributed applications; relying either on industrial-strength middleware standards such as CORBA, the Distributed System Annex of Ada 95, distribution programming paradigms such as Web Services, Message Oriented Middleware (MOM), or to implement application-specific middleware. . This package contains the debugging symbols. debian/libpolyorb2-dev.manpages0000644000000000000000000000011411761151277013722 0ustar debian/manpages/po_gnatdist.1 docs/iac.1 docs/idlac.1 docs/polyorb-config.1 debian/polyorb-servers.manpages0000644000000000000000000000034311761151277014070 0ustar debian/manpages/ir_ab_names.1 debian/manpages/po_catref.1 debian/manpages/po_cos_naming.1 debian/manpages/po_cos_naming_shell.1 debian/manpages/po_createref.1 debian/manpages/po_dumpir.1 debian/manpages/po_ir.1 docs/po_names.1 debian/source/0000755000000000000000000000000011761151277010476 5ustar debian/source/format0000644000000000000000000000001411761151277011704 0ustar 3.0 (quilt) debian/README0000644000000000000000000001106411761151277010060 0ustar http://libre.adacore.com/libre/tools/polyorb/ The PolyORB schizophrenic middleware ------------------------------------ PolyORB provides a uniform solution to build distributed applications; relying either on industrial-strength middleware standards such as CORBA, the Distributed System Annex of Ada 95, distribution programming paradigms such as Web Services, Message Oriented Middleware (MOM), or to implement application-specific middleware. Basically, middleware are framework that hide the complex issues of distribution and provide the programmer with high-level abstractions that enable easy and transparent construction of distributed applications. A number of different standards exist for creating object-oriented distributed applications. These standards offer two subsystems that enable interaction between application partitions: * the API seen by the developer's applicative objects; * the protocol used by the middleware environment to interact with other nodes in the distributed application. Besides, middleware provide implementation guidelines as well as development tools to ease the construction of large heterogeneous distributed systems. Yet, many issues typical to distributed programming may arise: application architectural choice, configuration or deployment. Since there is no "one size fits all" architecture, choosing the adequate distribution middleware in its most appropriate configuration is a key design point that dramatically impact the design and performance of an application. Consequently, applications need to rapidly tailor middleware to the specific distribution model they require. A distribution model is defined by the combination of distribution mechanisms made available to the application. Common examples of such mechanisms are Remote Procedure Call (RPC), Distributed Objects or Message Passing. A distribution infrastructure or middleware refers to software that supports one (or several) distribution model, e.g.: OMG CORBA, Java Remote Method Invocation (RMI), the Distributed System Annex of Ada 95, Java Message Service (MOM). PolyORB : a generic middleware with an instance per distribution model ---------------------------------------------------------------------- Typical middleware implementations for one platform supports only one set of such interfaces, pre-defined configuration capabilities and cannot interoperate with other platforms. In addition to traditional middleware implementations, PolyORB proposes an original architecture to enable support for multiple interoperating distribution models in a uniform canvas. PolyORB is a polymorphic, reusable infrastructure for building or prototyping new middleware adapted to specific application needs. It provides a set of components on top of which various instances can be elaborated. These instances (or personalities) are views on PolyORB facilities that are compliant to existing standards, either at the API level (application personality) or at the protocol level (protocol personality). These personalities are mutually exclusive views of the same architecture. The decoupling of application and protocol personalities, and the support for multiple simultaneous personalities within the same running middleware are key features required for the construction of interoperable distributed applications. This allows PolyORB to communicate with middleware that implement different distribution standards: PolyORB provides middleware-to-middleware interoperability (M2M). Besides, PolyORB's modularity allows for the easy extension or modification of its core components and personalities to meet specific requirements. Thus standard compliant or specific personalities can be created in a unique process, from early stage prototyping to full featured implementation. The PolyORB architecture also permits the automatic, just-in-time creation of proxies between incompatible environments. PolyORB currently supports the following personalities (in the main development branch, available through Subversion access): * application personalities: CORBA, Distributed System Annex of Ada 95 (DSA), MOMA - MOM for Ada. Interaction between CORBA and DSA partitions has been successfully tested; * protocol personalities: SOAP, GIOP (CORBA protocol layer) and the folowing instanciations: IIOP (over TCP/IP), DIOP (over UDP/IP for oneway requests), and MIOP/UIPMC (group communication over multicast/IP); * under development: Web Services personality, an adaptation of the AWS API to PolyORB. Note: PolyORB is the project formerly known as DROOPI, a Distributed Reusable Object-Oriented Polymorphic Infrastructure. debian/addon/0000755000000000000000000000000011761151277010263 5ustar debian/addon/polyorb.gpr0000644000000000000000000000245411761151277012470 0ustar -- polyorb project file for use with GCC 4.3 -- Copyright (c) 2008 Xavier Grave -- Copyright (c) 2009 Ludovic Brenta -- Copyright (c) 2009 Reto Buerki -- -- 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. -- -- This project file is designed to help build applications that use -- polyorb. Here is an example of how to use this project file: -- -- with "polyorb"; -- project Example is -- for Object_Dir use "obj"; -- for Exec_Dir use "."; -- for Main use ("example"); -- end Example; project Polyorb is for Library_Name use "polyorb"; for Library_Dir use "/usr/lib"; for Library_Kind use "dynamic"; for Source_Dirs use ("/usr/share/ada/adainclude/polyorb"); for Library_ALI_Dir use "/usr/lib/ada/adalib/polyorb"; for Externally_Built use "true"; end Polyorb; debian/addon/manpages-src/0000755000000000000000000000000011761151277012643 5ustar debian/addon/manpages-src/po_catref.1.txt0000644000000000000000000000162511761151277015511 0ustar PO_CATREF(1) ============ NAME ---- po_catref - view the components of a stringified reference SYNOPSIS -------- *po_catref* 'REFERENCE' DESCRIPTION ----------- po_catref(1) is an utility for viewing the components of a stringified reference (CORBA IOR, corbaloc or URI). The reference’s components include references to access an object through multiple protocols (e.g. CORBA IIOP, SOAP) and configuration parameters associated with a reference (e.g. GIOP Service Contexts). *Note*: po_catref(1) can only process protocols PolyORB has been configured with. OPTIONS ------- 'REFERENCE':: Stringified reference to analyse and display. AUTHOR ------ This manual page was written by Reto Buerki for the Debian GNU/Linux system (but may be used by others). RESOURCES --------- Polyorb User Manual: debian/addon/manpages-src/po_createref.1.txt0000644000000000000000000000255411761151277016207 0ustar PO_CREATEREF(1) =============== NAME ---- po_createref - create IOR stringified references SYNOPSIS -------- *po_createref* -t 'type_id' -pn 'profile_nb' 'profile_description' DESCRIPTION ----------- po_createref(1) is an utility to create specific IOR stringified references (CORBA IOR, corbaloc or URI). The reference’s components and associated configuration parameters can be specified by using the command line switches of po_createref(1) (see section 'OPTIONS'). OPTIONS ------- *GIOP/IIOP profile*:: -pt iiop -i 'index' -g -cr 'father_poa' -vmj 'Major' -vmn 'Minor' -a 'Inet_Address' -p 'Port' -cn 'Components_Number' {-ct 'component_id' 'component' ce} pe *Policies component*:: policies -pol_nb 'policies_number' {-model 'SERVER_DECLARED|CLIENT' -priority 'value'} *Code_Sets component*:: -char 'code_set' -s 'supported_number' {'code_set'}-wchar 'code_set' -s 'supported_number' {'code_set'} *SSL component*:: ssl_trans -requires 'value' -supports 'value' -p 'port_number' *Alternate Address component*:: alternate_address -a 'inet_address' -p 'port_number' AUTHOR ------ This manual page was written by Reto Buerki for the Debian GNU/Linux system (but may be used by others). RESOURCES --------- Polyorb User Manual: SEE ALSO -------- po_catref(1). debian/addon/manpages-src/po_ir.1.txt0000644000000000000000000000164311761151277014657 0ustar PO_IR(1) ======== NAME ---- po_ir - standalone CORBA interface repository server SYNOPSIS -------- po_ir(1) provides no options, just start it by typing: *po_ir* DESCRIPTION ----------- po_ir(1) is a standalone server that supports the CORBA interface repository. When launched, it returns its IOR and corbaloc, which can then be used by other CORBA applications. If you want po_ir(1) to return the same IOR or corbaloc at each startup, you must set a default listen port for the protocol personalities you use. See the section about configuring protocol personality preferences in the Polyorb User Manual for more details. AUTHOR ------ This manual page was written by Reto Buerki for the Debian GNU/Linux system (but may be used by others). RESOURCES --------- Polyorb User Manual: SEE ALSO -------- po_dumpir(1). debian/addon/manpages-src/buildman.sh0000644000000000000000000000034311761151277014772 0ustar #!/bin/bash for man in `ls *.1.txt`; do echo "Creating manpage $man" a2x -d manpage -f manpage \ --xsltproc-opts='-param man.endnotes.list.enabled 0' \ --xsltproc-opts='-param man.endnotes.are.numbered 0' \ $man done; debian/addon/manpages-src/ir_ab_names.1.txt0000644000000000000000000000235111761151277016003 0ustar IR_AB_NAMES(1) ============== NAME ---- ir_ab_names - a standalone server that supports the CORBA COS Interface specification. SYNOPSIS -------- *ir_ab_names* -file 'filename' The *-file* switch is optional, see the OPTIONS section for details. DESCRIPTION ----------- ir_ab_names(1) is a standalone server that supports the CORBA COS Interface specification. When launched, it returns its IOR and corbaloc, which can then be used by other CORBA applications. OPTIONS ------- ir_ab_names(1) accepts the following options: *-file*:: Output COS Interface IOR to 'filename'. *-help*:: Print the usage text. *all PolyORB command line configuration variables*:: PolyORB allows one to set up configuration variables on the command line. The syntax is close to the one described in configuration files. A variable 'Var.Iable' in section [Sec] can be overridden with flag --polyorb---[=]. AUTHOR ------ This manual page was written by Reto Buerki for the Debian GNU/Linux system (but may be used by others). RESOURCES --------- Polyorb User Manual: SEE ALSO -------- po_cos_naming(1), po_cos_naming_shell(1). debian/addon/manpages-src/po_dumpir.1.txt0000644000000000000000000000123711761151277015544 0ustar PO_DUMPIR(1) ============ NAME ---- po_dumpir - the CORBA interface repository content dumper SYNOPSIS -------- *po_dumpir* 'REFERENCE' DESCRIPTION ----------- po_dumpir(1) is a utility for viewing the content of an instance of the CORBA interface repository. OPTIONS ------- 'REFERENCE':: Stringified reference of an instance of the CORBA interface repository. AUTHOR ------ This manual page was written by Reto Buerki for the Debian GNU/Linux system (but may be used by others). RESOURCES --------- Polyorb User Manual: SEE ALSO -------- po_ir(1). debian/addon/manpages-src/po_cos_naming_shell.1.txt0000644000000000000000000000277411761151277017557 0ustar PO_COS_NAMING_SHELL(1) ====================== NAME ---- po_cos_naming_shell - navigate and interact with the CORBA COS Naming implementation. SYNOPSIS -------- *po_cos_naming_shell* [-s] [-i] [-I ] [-n] All the command line switches are optional. Note: if no root directory initial reference is specified (see section 'OPTIONS'), a new one is created on startup. DESCRIPTION ----------- po_cos_naming_shell(1) is very similar to the po_cos_naming(1) application. po_cos_naming_shell(1) can can act as standalone server that supports the CORBA COS Naming specification. In addition, po_cos_naming_shell(1) provides an interactive shell which can be used to query and manage the CORBA COS naming service. po_cos_naming_shell(1) is able to retrive an existing root directory reference, or it can create a new one on application startup. To display all available shell commands, type *help* on the command line. OPTIONS ------- po_cos_naming_shell(1) accepts the following command line switches: *-s*:: Register root directory initial reference. *-i*:: Retrieve root directory initial reference. *-I *:: Use object denoted by IOR as root directory. *-n*:: Retrieve root directory by name. AUTHOR ------ This manual page was written by Reto Buerki for the Debian GNU/Linux system (but may be used by others). RESOURCES --------- Polyorb User Manual: SEE ALSO -------- po_cos_naming(1), po_names(1). debian/compat0000644000000000000000000000000211761151277010374 0ustar 8 debian/polyorb-servers.install0000644000000000000000000000024611761151277013745 0ustar /usr/bin/po_catref /usr/bin/po_cos_naming /usr/bin/po_cos_naming_shell /usr/bin/po_createref /usr/bin/po_dumpir /usr/bin/po_ir /usr/bin/po_names /usr/bin/ir_ab_names debian/libpolyorb3.lintian-overrides0000644000000000000000000000216711761151277015024 0ustar libpolyorb3: shlib-with-executable-stack usr/lib/*/libpolyorb-corba-cos-event-impl.so.3 libpolyorb3: shlib-with-executable-stack usr/lib/*/libpolyorb-corba-cos-ir-impl.so.3 libpolyorb3: shlib-with-executable-stack usr/lib/*/libpolyorb-corba-cos-naming.so.3 libpolyorb3: shlib-with-executable-stack usr/lib/*/libpolyorb-corba-cos-notification-impl.so.3 libpolyorb3: shlib-with-executable-stack usr/lib/*/libpolyorb-corba-cos-notification.so.3 libpolyorb3: shlib-with-executable-stack usr/lib/*/libpolyorb-corba-dynamicany.so.3 libpolyorb3: shlib-with-executable-stack usr/lib/*/libpolyorb-corba-iop.so.3 libpolyorb3: shlib-with-executable-stack usr/lib/*/libpolyorb-corba-messaging.so.3 libpolyorb3: shlib-with-executable-stack usr/lib/*/libpolyorb-corba-portableinterceptor.so.3 libpolyorb3: shlib-with-executable-stack usr/lib/*/libpolyorb-corba-rtcorba.so.3 libpolyorb3: shlib-with-executable-stack usr/lib/*/libpolyorb-corba.so.3 libpolyorb3: shlib-with-executable-stack usr/lib/*/libpolyorb-dsa.so.3 libpolyorb3: shlib-with-executable-stack usr/lib/*/libpolyorb-moma.so.3 libpolyorb3: shlib-with-executable-stack usr/lib/*/libpolyorb.so.3 debian/libpolyorb3.install0000644000000000000000000000002211761151277013020 0ustar /usr/lib/*/*.so.* debian/copyright0000644000000000000000000000552211761151277011135 0ustar Authors: PolyORB is primarily developed by Jerome Hugues, Thomas Vergnaud, Khaled Barbaria, Laurent Pautet (ENST Paris), and Thomas Quinot (AdaCore). Fabrice Kordon (LIP6) also participates in the project. Vadim Godunko regularly contributes by submitting patches. To email developers : polyorb-devel@lists.adacore.com. Download: http://libre.adacore.com/libre/tools/polyorb/ Files: * Copyright: (C) 1999-2009, Free Software Foundation, Inc. License: GPL-2+ PolyORB is free software; you can redistribute it and/or modify it under terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. PolyORB 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. Maintainer's note: PolyORB is licensed under the terms of the pure GPL. As a consequence, it isn't legal to distribute proprietary software that incorporates this library. If your program uses PolyORB, and if you wish your program to use licensing terms incompatible with the GPL, you have three choices: - Distribute your program in source form only, and require your licensees to build it for themselves. Your sources need not be under GPL, since they are not linked to PolyORB. - Contact AdaCore, the upstream author, at sales@adacore.com, and purchase a GMGPL license for PolyORB. - Do not distribute your program at all. You may be tempted to retrieve the sources from AdaCore's subversion repository. Be warned that doing so will still grant you a pure GPL license, despite the fact that AdaCore have not yet adjusted the licensing boilerplate in source files. In Debian, the "special exception" language has been removed only to remove confusion. It is not the Debian package maintainers who changed the actual license, it is AdaCore. Contact them at libre@adacore.com for any clarification. Files: debian/* Copyright: (C) 2009 Reto Buerki Copyright: (C) 2008-2012 Xavier Grave License: GPL-3+ 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 . . On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file. debian/README.source0000644000000000000000000001166711761151277011370 0ustar Oh mighty Emacs, please use -*- Outline -*- mode in this humble file. Packaging a new upstream release of PolyORB for Debian ------------------------------------------------------ * Choosing which version to package The implementation of the Distributed Systems Annex in PolyORB (package System.Partition_Interface in file s-parint.ad[bs]) is tightly coupled with the package of the same name in the GNAT run-time library. When building a monolithic application, GNAT uses its own version of System.Partition_Interface which is part of libgnat. When building a distributed application under the control of gnatdist, GNAT uses the version from PolyORB instead. For this reason, both versions must have compatible interfaces at the source level. The first versions of System.Partition_Interface did not have any version number. Later, a constant was introduced: PCS_Version. Later still, the PCS_Version became a function of the implementation of the distributed systems annex; i.e. it has one value for GARLIC/GLADE and another value for PolyORB. For Ada Distributed Systems to work, this constant must be the same in gnat (file exp_dist.ads) and in PolyORB. The following denotes the PolyORB value of PCS_Version. ** PCS_Version = 1 - introduced in PolyORB on 2007-07-11. - released in PolyORB 2.3 - introduced in GCC on 2007-08-14. - released in GCC 4.3.0 on 2008-03-05. ** PCS_Version = 2 - introduced in PolyORB on 2008-04-30. - released in PolyORB 2.4 included in GNAT GPL 2008 Edition. - introduced in GCC on 2008-05-26. - released in GCC 4.4.0 on 2009-04-21. ** PCS_Version = 3 - fixes a release-critical bug related to passing Strings across partitions. - introduced in PolyORB on 2009-02-12. - to be released in PolyORB 2.6 - introduced in GCC on 2009-05-06. - to be released in GCC 4.5.0. (The staged development process of GCC with timeline is at http://gcc.gnu.org/develop.html) I (Ludovic) have backported PCS_Version=3 into gnat-4.4 for Squeeze; this should make it possible to support the Distributed Systems Annex with a recent (>=2.6) version of PolyORB. * Licencing terms for the sources As explained in debian/copyright, the license of PolyORB is the pure GPL no matter what the sources say. If you check out from AdaCore's Subversion repository, you will see that the sources contain the "special exception" (GNAT-Modified GPL) text. This does NOT change the license. The license is the pure GPL. In order to reduce confusion for Debian users, it is necessary to remove the exception text from all sources of PolyORB before packaging a new .orig.tar.gz. Here is a shell script that achieves that: ** Shell script #!/bin/bash # remove-gmgpl-exception - remove the GMGPL exception from all Ada source files # Copyright (c) 2006 Ludovic Brenta # This script is free software; you can redistribute it and/or modify # it under terms of the GNU General Public License as published by the # Free Software Foundation; either version 2, or (at your option) any # later version. GtkAda 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. # On Debian GNU/Linux systems, the complete text of the GNU General # Public License can be found in `/usr/share/common-licenses/GPL'. # Starting with GtkAda 2.8, the license changed from GNAT-Modified to # pure GPL. However, upstream has not yet removed the exception text # from all source files, creating potential for confusion. This # script removes the exception text; I used it before creating the # .orig.tar.gz file. GtkAda also contains some C source files, but I # have not yet removed the exception text from them because they're # not installed in the -dev binary packages. ex1="As +a +special +exception\, +if +other +files +instantiate +generics +from" ex6="covered +by +the +GNU +Public +License\." cat > program < ${source}.tmp touch --reference=${source} ${source}.tmp mv -f ${source}.tmp ${source} done fi rm program * Licensing terms for the documentation Like everything else on the AdaCore public web site, the documentation is under GPL, despite the fact that the PolyORB user's guide (docs/polyorb_ug.texi) says it uses the GNU Free Documentation License with invariant sections. This has a number of consequences: 1) The Debian maintainer must change the licensing terms in docs/polyorb_ug.texi to the GPL. 2) The documentation belongs to the main section in Debian (this is good news because the invariant sections in the GFDL would prevent that and relegate the documentation to non-free and to a separate source package). 3) The Debian maintainer needs not (indeed may not) include docs/gfdl.texi in the .orig.tar.gz. debian/clean0000644000000000000000000002675111761151277010216 0ustar examples/corba/send/test-controller.adb examples/corba/send/test-controller.ads examples/corba/send/test-controller-helper.adb examples/corba/send/test-controller-helper.ads examples/corba/send/test-controller-skel.adb examples/corba/send/test-controller-skel.ads testsuite/corba/all_exceptions/all_exceptions.adb testsuite/corba/all_exceptions/all_exceptions.ads testsuite/corba/all_exceptions/all_exceptions-helper.adb testsuite/corba/all_exceptions/all_exceptions-helper.ads testsuite/corba/all_exceptions/all_exceptions-skel.adb testsuite/corba/all_exceptions/all_exceptions-skel.ads testsuite/corba/benchs/test000/test-activator.ads testsuite/corba/benchs/test000/test-activator-helper.adb testsuite/corba/benchs/test000/test-activator-helper.ads testsuite/corba/benchs/test000/test.ads testsuite/corba/benchs/test000/test-echo.adb testsuite/corba/benchs/test000/test-echo.ads testsuite/corba/benchs/test000/test-echo-helper.adb testsuite/corba/benchs/test000/test-echo-helper.ads testsuite/corba/benchs/test000/test-echo-skel.adb testsuite/corba/benchs/test000/test-echo-skel.ads testsuite/corba/benchs/test000/test-factory.adb testsuite/corba/benchs/test000/test-factory.ads testsuite/corba/benchs/test000/test-factory-helper.adb testsuite/corba/benchs/test000/test-factory-helper.ads testsuite/corba/benchs/test000/test-factory-skel.adb testsuite/corba/benchs/test000/test-factory-skel.ads testsuite/corba/code_sets/test000/test_interface.adb testsuite/corba/code_sets/test000/test_interface.ads testsuite/corba/code_sets/test000/test_interface-helper.adb testsuite/corba/code_sets/test000/test_interface-helper.ads testsuite/corba/code_sets/test000/test_interface-skel.adb testsuite/corba/code_sets/test000/test_interface-skel.ads testsuite/corba/cos/event/typedtest_interface.adb testsuite/corba/cos/event/typedtest_interface.ads testsuite/corba/cos/event/typedtest_interface-helper.adb testsuite/corba/cos/event/typedtest_interface-helper.ads testsuite/corba/cos/event/typedtest_interface-skel.adb testsuite/corba/cos/event/typedtest_interface-skel.ads testsuite/corba/domainmanager/test000/test.ads testsuite/corba/domainmanager/test000/test-domainmanager.adb testsuite/corba/domainmanager/test000/test-domainmanager.ads testsuite/corba/domainmanager/test000/test-domainmanager-helper.adb testsuite/corba/domainmanager/test000/test-domainmanager-helper.ads testsuite/corba/domainmanager/test000/test-domainmanager-skel.adb testsuite/corba/domainmanager/test000/test-domainmanager-skel.ads testsuite/corba/domainmanager/test000/test-echo.adb testsuite/corba/domainmanager/test000/test-echo.ads testsuite/corba/domainmanager/test000/test-echo-helper.adb testsuite/corba/domainmanager/test000/test-echo-helper.ads testsuite/corba/domainmanager/test000/test-echo-skel.adb testsuite/corba/domainmanager/test000/test-echo-skel.ads testsuite/corba/harness/harness.adb testsuite/corba/harness/harness.ads testsuite/corba/harness/harness-helper.adb testsuite/corba/harness/harness-helper.ads testsuite/corba/harness/harness-skel.adb testsuite/corba/harness/harness-skel.ads testsuite/corba/location_forwarding/test000/test_interface.adb testsuite/corba/location_forwarding/test000/test_interface.ads testsuite/corba/location_forwarding/test000/test_interface-helper.adb testsuite/corba/location_forwarding/test000/test_interface-helper.ads testsuite/corba/location_forwarding/test000/test_interface-skel.adb testsuite/corba/location_forwarding/test000/test_interface-skel.ads testsuite/corba/location_forwarding/test000/test_servantactivator.ads testsuite/corba/location_forwarding/test000/test_servantactivator-helper.adb testsuite/corba/location_forwarding/test000/test_servantactivator-helper.ads testsuite/corba/location_forwarding/test001/test_interface.adb testsuite/corba/location_forwarding/test001/test_interface.ads testsuite/corba/location_forwarding/test001/test_interface-helper.adb testsuite/corba/location_forwarding/test001/test_interface-helper.ads testsuite/corba/location_forwarding/test001/test_interface-skel.adb testsuite/corba/location_forwarding/test001/test_interface-skel.ads testsuite/corba/location_forwarding/test001/test_servantactivator.ads testsuite/corba/location_forwarding/test001/test_servantactivator-helper.adb testsuite/corba/location_forwarding/test001/test_servantactivator-helper.ads testsuite/corba/object/test000/test_interface.adb testsuite/corba/object/test000/test_interface.ads testsuite/corba/object/test000/test_interface-helper.adb testsuite/corba/object/test000/test_interface-helper.ads testsuite/corba/object/test000/test_interface-skel.adb testsuite/corba/object/test000/test_interface-skel.ads testsuite/corba/performance/benchs.adb testsuite/corba/performance/benchs.ads testsuite/corba/performance/benchs-helper.adb testsuite/corba/performance/benchs-helper.ads testsuite/corba/performance/benchs-skel.adb testsuite/corba/performance/benchs-skel.ads testsuite/corba/portableinterceptor/test000/test000_idl.ads testsuite/corba/portableinterceptor/test000/test000_idl-clientinterceptor.adb testsuite/corba/portableinterceptor/test000/test000_idl-clientinterceptor.ads testsuite/corba/portableinterceptor/test000/test000_idl-clientinterceptor-helper.adb testsuite/corba/portableinterceptor/test000/test000_idl-clientinterceptor-helper.ads testsuite/corba/portableinterceptor/test000/test000_idl-helper.adb testsuite/corba/portableinterceptor/test000/test000_idl-helper.ads testsuite/corba/portableinterceptor/test000/test000_idl-orbinitializer.ads testsuite/corba/portableinterceptor/test000/test000_idl-orbinitializer-helper.adb testsuite/corba/portableinterceptor/test000/test000_idl-orbinitializer-helper.ads testsuite/corba/portableinterceptor/test000/test000_idl-serverinterceptor.adb testsuite/corba/portableinterceptor/test000/test000_idl-serverinterceptor.ads testsuite/corba/portableinterceptor/test000/test000_idl-serverinterceptor-helper.adb testsuite/corba/portableinterceptor/test000/test000_idl-serverinterceptor-helper.ads testsuite/corba/portableinterceptor/test000/test000_idl-testinterface.adb testsuite/corba/portableinterceptor/test000/test000_idl-testinterface.ads testsuite/corba/portableinterceptor/test000/test000_idl-testinterface-helper.adb testsuite/corba/portableinterceptor/test000/test000_idl-testinterface-helper.ads testsuite/corba/portableinterceptor/test000/test000_idl-testinterface-skel.adb testsuite/corba/portableinterceptor/test000/test000_idl-testinterface-skel.ads testsuite/corba/portableinterceptor/test001/test001_client_interceptor.ads testsuite/corba/portableinterceptor/test001/test001_client_interceptor-helper.adb testsuite/corba/portableinterceptor/test001/test001_client_interceptor-helper.ads testsuite/corba/portableinterceptor/test001/test001_interface.adb testsuite/corba/portableinterceptor/test001/test001_interface.ads testsuite/corba/portableinterceptor/test001/test001_interface-helper.adb testsuite/corba/portableinterceptor/test001/test001_interface-helper.ads testsuite/corba/portableinterceptor/test001/test001_interface-skel.adb testsuite/corba/portableinterceptor/test001/test001_interface-skel.ads testsuite/corba/portableinterceptor/test001/test001_orb_initializer.ads testsuite/corba/portableinterceptor/test001/test001_orb_initializer-helper.adb testsuite/corba/portableinterceptor/test001/test001_orb_initializer-helper.ads testsuite/corba/portableinterceptor/test001/test001_server_interceptor.ads testsuite/corba/portableinterceptor/test001/test001_server_interceptor-helper.adb testsuite/corba/portableinterceptor/test001/test001_server_interceptor-helper.ads testsuite/corba/portableinterceptor/test002/test002_client_interceptor.ads testsuite/corba/portableinterceptor/test002/test002_client_interceptor-helper.adb testsuite/corba/portableinterceptor/test002/test002_client_interceptor-helper.ads testsuite/corba/portableinterceptor/test002/test002_interface.adb testsuite/corba/portableinterceptor/test002/test002_interface.ads testsuite/corba/portableinterceptor/test002/test002_interface-helper.adb testsuite/corba/portableinterceptor/test002/test002_interface-helper.ads testsuite/corba/portableinterceptor/test002/test002_interface-skel.adb testsuite/corba/portableinterceptor/test002/test002_interface-skel.ads testsuite/corba/portableinterceptor/test002/test002_orb_initializer.ads testsuite/corba/portableinterceptor/test002/test002_orb_initializer-helper.adb testsuite/corba/portableinterceptor/test002/test002_orb_initializer-helper.ads testsuite/corba/portableinterceptor/test002/test002_server_interceptor.ads testsuite/corba/portableinterceptor/test002/test002_server_interceptor-helper.adb testsuite/corba/portableinterceptor/test002/test002_server_interceptor-helper.ads testsuite/corba/portableinterceptor/test004/test.ads testsuite/corba/portableinterceptor/test004/test-clientinterceptor.ads testsuite/corba/portableinterceptor/test004/test-clientinterceptor-helper.adb testsuite/corba/portableinterceptor/test004/test-clientinterceptor-helper.ads testsuite/corba/portableinterceptor/test004/test-clientorbinitializer.ads testsuite/corba/portableinterceptor/test004/test-clientorbinitializer-helper.adb testsuite/corba/portableinterceptor/test004/test-clientorbinitializer-helper.ads testsuite/corba/portableinterceptor/test004/test-demo.adb testsuite/corba/portableinterceptor/test004/test-demo.ads testsuite/corba/portableinterceptor/test004/test-demo-helper.adb testsuite/corba/portableinterceptor/test004/test-demo-helper.ads testsuite/corba/portableinterceptor/test004/test-demo-skel.adb testsuite/corba/portableinterceptor/test004/test-demo-skel.ads testsuite/corba/portableinterceptor/test004/test-iorinterceptor.ads testsuite/corba/portableinterceptor/test004/test-iorinterceptor-helper.adb testsuite/corba/portableinterceptor/test004/test-iorinterceptor-helper.ads testsuite/corba/portableinterceptor/test004/test-serverorbinitializer.ads testsuite/corba/portableinterceptor/test004/test-serverorbinitializer-helper.adb testsuite/corba/portableinterceptor/test004/test-serverorbinitializer-helper.ads testsuite/corba/portableserver/echo.adb testsuite/corba/portableserver/echo.ads testsuite/corba/portableserver/echo-helper.adb testsuite/corba/portableserver/echo-helper.ads testsuite/corba/portableserver/echo-skel.adb testsuite/corba/portableserver/echo-skel.ads testsuite/corba/portableserver/test.adb testsuite/corba/portableserver/test.ads testsuite/corba/portableserver/test-helper.adb testsuite/corba/portableserver/test-helper.ads testsuite/corba/portableserver/test_nullactivator.ads testsuite/corba/portableserver/test_nullactivator-helper.adb testsuite/corba/portableserver/test_nullactivator-helper.ads testsuite/corba/portableserver/test_simpleactivator.ads testsuite/corba/portableserver/test_simpleactivator-helper.adb testsuite/corba/portableserver/test_simpleactivator-helper.ads testsuite/corba/portableserver/test-skel.adb testsuite/corba/portableserver/test-skel.ads testsuite/corba/shutdown/test_interface.adb testsuite/corba/shutdown/test_interface.ads testsuite/corba/shutdown/test_interface-helper.adb testsuite/corba/shutdown/test_interface-helper.ads testsuite/corba/shutdown/test_interface-skel.adb testsuite/corba/shutdown/test_interface-skel.ads build-stamp configure-stamp config.log compilers/iac/mknodes testsuite/destinations.conf testsuite/test_failed compilers/idlac/idl_fe-tree.ad* support/native-linker support/native-adacompiler support/texinfo.tex support/ltmain.sh support/config.guess support/config.sub support/libtool.m4 docs/Makefile.in docs/MANIFEST src/config.h* src/stamp-h1 aclocal.m4 configure libtool docs/echo.idl docs/echo-impl-body.adb docs/client.adb docs/server.adb docs/echo-impl-spec.ads src/polyorb-smart_pointers-sync_counters.adb debian/libpolyorb2-dev.install0000644000000000000000000000025611761151277013604 0ustar /usr/lib/*/*.a /usr/lib/*/*.so /usr/share/ada/adainclude /usr/lib/ada/adalib /usr/bin/polyorb-config /usr/bin/iac /usr/bin/idlac /usr/bin/polyorb-config /usr/bin/po_gnatdist debian/polyorb-doc.install0000644000000000000000000000041111761647627013024 0ustar /usr/share/doc/polyorb/* /usr/share/doc/polyorb-doc examples/corba /usr/share/doc/polyorb-doc/examples/ examples/polyorb /usr/share/doc/polyorb-doc/examples/ examples/README /usr/share/doc/polyorb-doc/examples/ src/polyorb.conf /usr/share/doc/polyorb-doc/examples/ debian/manpages/0000755000000000000000000000000011761151277010771 5ustar debian/manpages/po_ir.10000644000000000000000000000232211761151277012162 0ustar .\" Title: po_ir .\" Author: .\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 05/21/2009 .\" Manual: .\" Source: .\" .TH "PO_IR" "1" "05/21/2009" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" po_ir \- standalone CORBA interface repository server .SH "SYNOPSIS" po_ir(1) provides no options, just start it by typing: \fBpo_ir\fR .sp .SH "DESCRIPTION" po_ir(1) is a standalone server that supports the CORBA interface repository\&. When launched, it returns its IOR and corbaloc, which can then be used by other CORBA applications\&. .sp If you want po_ir(1) to return the same IOR or corbaloc at each startup, you must set a default listen port for the protocol personalities you use\&. See the section about configuring protocol personality preferences in the Polyorb User Manual for more details\&. .sp .SH "AUTHOR" This manual page was written by Reto Buerki for the Debian GNU/Linux system (but may be used by others)\&. .sp .SH "RESOURCES" Polyorb User Manual: http://www\&.adacore\&.com/wp\-content/files/auto_update/polyorb\-docs/polyorb_ug\&.html/ .sp .SH "SEE ALSO" po_dumpir(1)\&. .sp debian/manpages/po_dumpir.10000644000000000000000000000172211761151277013053 0ustar .\" Title: po_dumpir .\" Author: .\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 05/21/2009 .\" Manual: .\" Source: .\" .TH "PO_DUMPIR" "1" "05/21/2009" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" po_dumpir \- the CORBA interface repository content dumper .SH "SYNOPSIS" \fBpo_dumpir\fR \fIREFERENCE\fR .sp .SH "DESCRIPTION" po_dumpir(1) is a utility for viewing the content of an instance of the CORBA interface repository\&. .sp .SH "OPTIONS" .PP \fIREFERENCE\fR .RS 4 Stringified reference of an instance of the CORBA interface repository\&. .RE .SH "AUTHOR" This manual page was written by Reto Buerki for the Debian GNU/Linux system (but may be used by others)\&. .sp .SH "RESOURCES" Polyorb User Manual: http://www\&.adacore\&.com/wp\-content/files/auto_update/polyorb\-docs/polyorb_ug\&.html/ .sp .SH "SEE ALSO" po_ir(1)\&. .sp debian/manpages/po_catref.10000644000000000000000000000233211761151277013015 0ustar .\" Title: po_catref .\" Author: .\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 05/20/2009 .\" Manual: .\" Source: .\" .TH "PO_CATREF" "1" "05/20/2009" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" po_catref \- view the components of a stringified reference .SH "SYNOPSIS" \fBpo_catref\fR \fIREFERENCE\fR .sp .SH "DESCRIPTION" po_catref(1) is an utility for viewing the components of a stringified reference (CORBA IOR, corbaloc or URI)\&. The reference\(cqs components include references to access an object through multiple protocols (e\&.g\&. CORBA IIOP, SOAP) and configuration parameters associated with a reference (e\&.g\&. GIOP Service Contexts)\&. .sp \fBNote\fR: po_catref(1) can only process protocols PolyORB has been configured with\&. .sp .SH "OPTIONS" .PP \fIREFERENCE\fR .RS 4 Stringified reference to analyse and display\&. .RE .SH "AUTHOR" This manual page was written by Reto Buerki for the Debian GNU/Linux system (but may be used by others)\&. .sp .SH "RESOURCES" Polyorb User Manual: http://www\&.adacore\&.com/wp\-content/files/auto_update/polyorb\-docs/polyorb_ug\&.html/ .sp debian/manpages/po_cos_naming_shell.10000644000000000000000000000360211761151277015056 0ustar .\" Title: po_cos_naming_shell .\" Author: .\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 05/21/2009 .\" Manual: .\" Source: .\" .TH "PO_COS_NAMING_SHELL" "1" "05/21/2009" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" po_cos_naming_shell \- navigate and interact with the CORBA COS Naming implementation. .SH "SYNOPSIS" \fBpo_cos_naming_shell\fR [\-s] [\-i] [\-I ] [\-n] .sp All the command line switches are optional\&. Note: if no root directory initial reference is specified (see section \fIOPTIONS\fR), a new one is created on startup\&. .sp .SH "DESCRIPTION" po_cos_naming_shell(1) is very similar to the po_cos_naming(1) application\&. po_cos_naming_shell(1) can can act as standalone server that supports the CORBA COS Naming specification\&. In addition, po_cos_naming_shell(1) provides an interactive shell which can be used to query and manage the CORBA COS naming service\&. .sp po_cos_naming_shell(1) is able to retrive an existing root directory reference, or it can create a new one on application startup\&. .sp To display all available shell commands, type \fBhelp\fR on the command line\&. .sp .SH "OPTIONS" po_cos_naming_shell(1) accepts the following command line switches: .PP \fB\-s\fR .RS 4 Register root directory initial reference\&. .RE .PP \fB\-i\fR .RS 4 Retrieve root directory initial reference\&. .RE .PP \fB\-I \fR .RS 4 Use object denoted by IOR as root directory\&. .RE .PP \fB\-n\fR .RS 4 Retrieve root directory by name\&. .RE .SH "AUTHOR" This manual page was written by Reto Buerki for the Debian GNU/Linux system (but may be used by others)\&. .sp .SH "RESOURCES" Polyorb User Manual: http://www\&.adacore\&.com/wp\-content/files/auto_update/polyorb\-docs/polyorb_ug\&.html/ .sp .SH "SEE ALSO" po_cos_naming(1), po_names(1)\&. .sp debian/manpages/ir_ab_names.10000644000000000000000000000313011761151277013307 0ustar .\" Title: ir_ab_names .\" Author: .\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 05/21/2009 .\" Manual: .\" Source: .\" .TH "IR_AB_NAMES" "1" "05/21/2009" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" ir_ab_names \- a standalone server that supports the CORBA COS Interface specification. .SH "SYNOPSIS" \fBir_ab_names\fR \-file \fIfilename\fR .sp The \fB\-file\fR switch is optional, see the OPTIONS section for details\&. .sp .SH "DESCRIPTION" ir_ab_names(1) is a standalone server that supports the CORBA COS Interface specification\&. When launched, it returns its IOR and corbaloc, which can then be used by other CORBA applications\&. .sp .SH "OPTIONS" ir_ab_names(1) accepts the following options: .PP \fB\-file\fR .RS 4 Output COS Interface IOR to \fIfilename\fR\&. .RE .PP \fB\-help\fR .RS 4 Print the usage text\&. .RE .PP \fBall PolyORB command line configuration variables\fR .RS 4 PolyORB allows one to set up configuration variables on the command line\&. The syntax is close to the one described in configuration files\&. A variable \fIVar\&.Iable\fR in section [Sec] can be overridden with flag \-\-polyorb\-\-\-[=]\&. .RE .SH "AUTHOR" This manual page was written by Reto Buerki for the Debian GNU/Linux system (but may be used by others)\&. .sp .SH "RESOURCES" Polyorb User Manual: http://www\&.adacore\&.com/wp\-content/files/auto_update/polyorb\-docs/polyorb_ug\&.html/ .sp .SH "SEE ALSO" po_cos_naming(1), po_cos_naming_shell(1)\&. .sp debian/manpages/po_gnatdist.10000644000000000000000000000271711761151277013375 0ustar .TH PO_GNATDIST 1 .SH NAME po_gnatdist \- a tool to build a DSA application with polyorb .SH SYNOPSYS .B po_gnatdist [switches] configuration\-file [list\-of\-partitions] .SH DESCRIPTION .PP \fIpo_gnatdist\fP is a program let you build distributed applications with GNAT, the GNU Ada 95 compiler. It is part of the .B POLYORB package. .SH OPTIONS \fIpo_gnatdist\fP accepts the following options: .TP 8 .B all gnatmake switches .TP 8 .B \-PCS allows the user to override the default selection of distribution runtime library (PCS). .TP 8 .B \-n allows po_gnatdist to skip the first stage of recompilation of the non-distributed application. .SH CONFIGURATION FILE The names of all configuration files must have the suffix .cfg. There may be several configuration files for the same distributed application, as the user may want to use different distributed configurations depending on load and other characteristics of the computing environment. .SH PARTITIONS If a list of partitions is provided on the command line of the po_gnatdist command, only these partitions will be built. In the following configuration example, the user can type : po_gnatdist .SH AUTHOR This manual page was written by Xavier Grave , for the Debian GNU/Linux system (but may be used by others). Most of the material of this man page was grabed on : .B http://www.adacore.com/wp\-content/files/auto_update/polyorb\-docs/polyorb_ug.html/ debian/manpages/po_createref.10000644000000000000000000000353311761151277013515 0ustar .\" Title: po_createref .\" Author: .\" Generator: DocBook XSL Stylesheets v1.73.2 .\" Date: 05/21/2009 .\" Manual: .\" Source: .\" .TH "PO_CREATEREF" "1" "05/21/2009" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" po_createref \- create IOR stringified references .SH "SYNOPSIS" \fBpo_createref\fR \-t \fItype_id\fR \-pn \fIprofile_nb\fR \fIprofile_description\fR .sp .SH "DESCRIPTION" po_createref(1) is an utility to create specific IOR stringified references (CORBA IOR, corbaloc or URI)\&. The reference\(cqs components and associated configuration parameters can be specified by using the command line switches of po_createref(1) (see section \fIOPTIONS\fR)\&. .sp .SH "OPTIONS" .PP \fBGIOP/IIOP profile\fR .RS 4 \-pt iiop \-i \fIindex\fR \-g \-cr \fIfather_poa\fR \-vmj \fIMajor\fR \-vmn \fIMinor\fR \-a \fIInet_Address\fR \-p \fIPort\fR \-cn \fIComponents_Number\fR {\-ct \fIcomponent_id\fR \fIcomponent\fR ce} pe .RE .PP \fBPolicies component\fR .RS 4 policies \-pol_nb \fIpolicies_number\fR {\-model \fISERVER_DECLARED|CLIENT\fR \-priority \fIvalue\fR} .RE .PP \fBCode_Sets component\fR .RS 4 \-char \fIcode_set\fR \-s \fIsupported_number\fR {\fIcode_set\fR}\-wchar \fIcode_set\fR \-s \fIsupported_number\fR {\fIcode_set\fR} .RE .PP \fBSSL component\fR .RS 4 ssl_trans \-requires \fIvalue\fR \-supports \fIvalue\fR \-p \fIport_number\fR .RE .PP \fBAlternate Address component\fR .RS 4 alternate_address \-a \fIinet_address\fR \-p \fIport_number\fR .RE .SH "AUTHOR" This manual page was written by Reto Buerki for the Debian GNU/Linux system (but may be used by others)\&. .sp .SH "RESOURCES" Polyorb User Manual: http://www\&.adacore\&.com/wp\-content/files/auto_update/polyorb\-docs/polyorb_ug\&.html/ .sp .SH "SEE ALSO" po_catref(1)\&. .sp debian/manpages/po_cos_naming.10000644000000000000000000000217411761151277013672 0ustar .TH PO_COS_NAMING 1 .SH NAME po_cos_naming \- a standalone server that supports the CORBA COS Naming specification. .SH SYNOPSYS .B po_cos_naming .TP 8 -file .TP 8 -help .SH DESCRIPTION .PP \fIpo_cos_naming\fP is a standalone server that supports the CORBA COS Naming specification. When launched, it returns its IOR and corbaloc, which can then be used by other CORBA applications. .SH OPTIONS \fIpo_cos_naming\fP accepts the following options: .TP 8 .B \-file output COS Naming IOR to 'filename' .TP 8 .B \-help print the help .TP 8 .B all PolyORB command line configuration variables PolyORB allows one to set up configuration variables on the command line. The syntax is close to the one described in configuration files. A variable Var.Iable in section [Sec] can be overridden with flag \-\-polyorb\-\-\-[=]. .SH AUTHOR This manual page was written by Xavier Grave , for the Debian GNU/Linux system (but may be used by others). Most of the material of this man page was grabed on : .B http://www.adacore.com/wp\-content/files/auto_update/polyorb\-docs/polyorb_ug.html/ debian/rules0000755000000000000000000001302211766177713010264 0ustar #!/usr/bin/make -f include /usr/share/dpkg/default.mk include /usr/share/ada/debian_packaging.mk # 2 . 8 ~20110207 -1 regexp := ^Version: ([^.]+)\.([^.]+)~([^-]*)-(.*) major := $(shell echo $(DEB_VERSION) | sed -r 's/$(regexp)/\1/') minor := $(shell echo $(DEB_VERSION) | sed -r 's/$(regexp)/\2/') date := $(shell echo $(DEB_VERSION) | sed -r 's/$(regexp)/\3/') upload := $(shell echo $(DEB_VERSION) | sed -r 's/$(regexp)/\4/') aliversion := $(shell sed -n -r 's/^Package: libpolyorb(.*)-dev$$/\1/p' debian/control) soversion := $(shell sed -n -r 's/^Package: libpolyorb([^-]+)$$/\1/p' debian/control) debian_libdir = debian/tmp/usr/lib revision = 0f4393e4f6d42f8d093a29b8fa35aebf4eb4a5f4 orig_dir = polyorb.orig orig_tgz = polyorb.orig.tar.gz orig_pkg_dir = polyorb-$(major).$(minor)~$(date).orig orig_pkg_tgz = polyorb_$(major).$(minor)~$(date).orig.tar.gz branch = com.adacore.polyorb.debian mtndb = polyorb.mtn mtn_uri := mtn://www.ada-france.org?com.adacore.polyorb.debian binary binary-arch binary-indep build build-arch build-indep install clean: dh $@ # Ignore upstream tests, if any. override_dh_auto_test: test_env: @echo "major=" $(major) @echo "minor=" $(minor) @echo "date=" $(date) @echo "aliversion=" $(aliversion) @echo "soversion=" $(soversion) @echo "upload=" $(upload) get-orig-source: if [ ! -e ../$(mtndb) ]; then \ mtn -d../$(mtndb) db init; \ fi; \ TMPDIR=$$(mktemp --tmpdir --directory polyorb-get-orig-source-XXXXXXXXXX) && \ mtn clone -d ../$(mtndb) $(mtn_uri) -k "" $$TMPDIR/$(orig_dir) && \ chmod uog-x $$TMPDIR/$(orig_dir)/examples/corba/send/print.idl && \ (cd $$TMPDIR && tar --create --gzip --exclude="_MTN" $(orig_dir)) > $(orig_tgz) ; \ rm -rf $$TMPDIR @echo "The file $(orig_tgz) contains the latest Debian snapshot of upstream sources." get-pkg-source: TMPDIR=$$(mktemp --tmpdir --directory polyorb-get-orig-source-XXXXXXXXXX) && \ if [ ! -e ../$(mtndb) ]; then \ mtn -d../$(mtndb) db init; \ fi; \ mtn -d../$(mtndb) -k "" pull $(mtn_uri); \ mtn -d../$(mtndb) co -r$(revision) -b$(branch) $$TMPDIR/$(orig_pkg_dir) && \ chmod uog-x $$TMPDIR/$(orig_pkg_dir)/examples/corba/send/print.idl && \ (cd $$TMPDIR && tar --create --gzip --exclude="_MTN" $(orig_pkg_dir)) > $(orig_pkg_tgz) rm -rf $$TMPDIR @echo "The file $(orig_pkg_tgz) contains the pkg Debian of upstream sources." override_dh_auto_configure: configure ADA=gnatgcc ./configure --prefix=`pwd`/debian/tmp \ --enable-debug \ --with-appli-perso="corba moma dsa" \ --with-proto-perso="giop" \ --with-corba-services="event ir naming notification time" configure: configure.ac support/reconfig DIRS := STATIC/src DYNAMIC/src $(DIRS): mkdir -p $@ EXAMPLES_EXE = polyorb/polyorb-test-thread_pool_poa EXAMPLES_EXE += polyorb/polyorb-test-no_tasking_poa EXAMPLES_EXE += polyorb/polyorb-test-thread_pool EXAMPLES_EXE += polyorb/polyorb-test-no_tasking EXAMPLES_EXE += corba/all_types/ir_server EXAMPLES_EXE += corba/all_types/client_moma corba/all_types/dynclient EXAMPLES_EXE += corba/all_types/server corba/all_types/client EXAMPLES_EXE += corba/echo/dynserver corba/echo/dynclient EXAMPLES_EXE += corba/echo/server corba/echo/client EXAMPLES_EXE += corba/all_functions/dynclient EXAMPLES_EXE += corba/all_functions/server corba/all_functions/client EXAMPLES_EXE += corba/thread_pool_tester/server corba/thread_pool_tester/client EXAMPLES_EXE += corba/random/server corba/random/client EXAMPLES_EXE += corba/send/listener corba/send/send override_dh_auto_build-arch: | $(DIRS) $(CC) -c -o STATIC/src/csupport.o -Isrc $(CFLAGS) src/csupport.c $(CC) -c -o DYNAMIC/src/csupport.o -Isrc $(CFLAGS) -fPIC src/csupport.c cp src/src.exclude STATIC/src cp src/src.exclude DYNAMIC/src $(MAKE) \ ADAFLAGS="-XLibversion=$(soversion) -XLibtype=STATIC $(ADAFLAGS)" \ PARALLEL_GNATMAKE_FLAGS="$(BUILDER_OPTIONS)" $(MAKE) \ ADAFLAGS="-XLibversion=$(soversion) -XLibtype=DYNAMIC $(ADAFLAGS)" \ PARALLEL_GNATMAKE_FLAGS="$(BUILDER_OPTIONS)" # if you really want to run the test suite run_testsuite: $(MAKE) examples rm -f testsuite/test_failed $(MAKE) testsuite cp -f src/moma/destinations.conf testsuite $(MAKE) run_tests # remove .o .ali and exe in examples dir before doc inclusion clean_examples_dir: find examples -name "*.o" -delete find examples -name "*.ali" -delete find examples -name "b~*.ad[sb]" -delete for i in $(EXAMPLES_EXE); do \ rm -f examples/$$i; \ done override_dh_auto_build-indep: | $(DIRS) $(MAKE) -C docs override_dh_auto_install-indep:clean_examples_dir $(MAKE) -C docs prefix=$(CURDIR)/debian/tmp/usr install-data-local override_dh_auto_clean:clean_examples_dir [ ! -f docs/Makefile ] || $(MAKE) -C docs clean [ ! -f Makefile ] || $(MAKE) distclean rm -rf STATIC DYNAMIC ali rm -f $(wildcard mkdir.flag b~*.ad[sb]) override_dh_auto_install-arch: $(MAKE) prefix=$(CURDIR)/debian/tmp/usr install cp debian/addon/polyorb.gpr debian/tmp/usr/share/ada/adainclude mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) cp $(debian_libdir)/*.a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) for lib in `ls $(debian_libdir)/lib*.so.$(soversion)`; do \ cp $$lib debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH); \ ln -sf `basename $$lib` \ $(debian_libdir)/$(DEB_HOST_MULTIARCH)/`basename $$lib | cut -d. -f1`.so; \ done; rm debian/tmp/usr/share/ada/adainclude/polyorb/*soap*.ad[sb] rm debian/tmp/usr/share/ada/adainclude/polyorb/*aws*.ad[sb] override_dh_compress-arch: dh_compress -X.ads -X.adb -XMakefile override_dh_strip-arch: dh_strip --dbg-package=libpolyorb-dbg .PHONY: build clean binary-indep binary-arch binary install debian/patches/0000755000000000000000000000000011761151277010625 5ustar debian/patches/handle-time-stamping-problem.patch0000644000000000000000000000052111761151277017311 0ustar --- a/Makefile.in +++ b/Makefile.in @@ -496,7 +496,7 @@ .PHONY: libpolyorb-dsa.a libpolyorb-dsa.a: polyorb_src_dsa.gpr -libpolyorb-dsa.a: PRJ_GNATMAKE_FLAGS := -a +libpolyorb-dsa.a: PRJ_GNATMAKE_FLAGS := -a -m # Some components of the DSA application personality are child units of # System: use -a to allow them to be compiled. debian/patches/configure-local-makefile.patch0000644000000000000000000000052511761151277016474 0ustar --- a/configure.ac +++ b/configure.ac @@ -842,7 +842,7 @@ LOCAL_MAKEFILES=config.local.makefiles -(cd ${srcdir} && find . -name Makefile.local) | sed "s,^\./,," | \ +(cd ${srcdir} && find . -name Makefile.local) | sed "s,^\./,," | sort | \ while read mklocal; do testdir="`dirname ${mklocal}`/" echo "current_dir := ${testdir}" debian/patches/fix-texi-syntax-error.patch0000644000000000000000000000625711761151277016070 0ustar --- a/docs/polyorb_dg.texi +++ b/docs/polyorb_dg.texi @@ -131,7 +131,7 @@ @subsection @code{PolyORB.Sequences.*} -@{Bounded,unbounded@} variable length arrays (cf. CORBA.Sequences.) +{Bounded,unbounded} variable length arrays (cf. CORBA.Sequences.) Notionally based on Ada.Strings.Unbounded. @subsection @code{PolyORB.Dynamic_Dict} @@ -156,7 +156,7 @@ @subsection @code{PolyORB.Configuration} User control of various middleware aspects is implemented -through a generic configuration framework. +through a generic configuration framework. At start-up, PolyORB will search for various configuration files, containing application profiles. See 'polyorb.conf' for a detail @@ -458,7 +458,7 @@ whatever you wish (@pxref{references}). @section Setting a minimal servant -@anchor{minimal servants} +@anchor{minimal servants} Minimal servants are alternative to classical servants. As their name suggests, they offer less flexibility than normal servants; however @@ -493,7 +493,7 @@ order to correctly handle the request. Method name is simply retrieved by reading the corresponding field -inside the request. +inside the request. In order to retrieve the arguments, you have to call the procedure @code{Arguments} of the package @code{PolyORB.Requests}. Indeed, the @@ -527,13 +527,13 @@ Invoking a request implies three mechanisms: @enumerate -@item +@item create a request; -@item +@item send it through the ORB; -@item +@item receive and analyse the answer (if the personality is based on a request/answer mechanism). @end enumerate @@ -550,16 +550,16 @@ @itemize -@item +@item the neutral reference of the targeted object; @item the name of the operation you want to invoke -@item +@item a list containing all the arguments sent to the object; -@item +@item a list describing the signature of the data expected as return, and an optional other for the possible exceptions; @@ -632,7 +632,7 @@ @subsubsection POA policies A POA is managed following policies, that define how to manage -servants, etc. The available policies are those that are defined +servants, etc. The available policies are those that are defined in @acronym{CORBA}. They are located in @code{PolyORB.POA_Policies.*} @node Protocol layer @@ -693,7 +693,7 @@ @example procedure body Initialize is begin - -- calling the registering procedures + -- calling the registering procedures end Initialize; begin @@ -734,7 +734,7 @@ @node Neutral layer @chapter Neutral layer -@noindent +@noindent The Neutral Layer is actually the inner middleware in itself. It offers several services and mechanisms to personalities. @@ -770,7 +770,7 @@ what are called @dfn{Any types}. Any types can carry various data types: integer, string, etc.@: An Any type associates raw data to a @dfn{TypeCode}, which indicates the nature of the -data. +data. @subsection Any types @@ -853,7 +853,7 @@ := PolyORB.Any.TypeCode.Content_Type (PolyORB.Any.Get_Type (Item)); - The_Array : array (1 .. Integer (Number_Of_Elements)) + The_Array : array (1 .. Integer (Number_Of_Elements)) of Element_Type; @end example debian/patches/xe_back-polyorb.adb.patch0000644000000000000000000000121311761151277015450 0ustar Index: org.debian.polyorb/compilers/gnatdist/xe_back-polyorb.adb =================================================================== --- org.debian.polyorb.orig/compilers/gnatdist/xe_back-polyorb.adb 2008-04-24 13:52:46.000152983 +0200 +++ org.debian.polyorb/compilers/gnatdist/xe_back-polyorb.adb 2008-04-24 13:53:53.736656722 +0200 @@ -730,7 +730,7 @@ Prj_File : File_Descriptor; DSA_Inc_Dir : constant String := - PolyORB_Prefix & Dir_Separator & DSA_Inc_Rel_Dir; + "/usr/share/ada/adainclude/polyorb"; Secondary_PCS_Project : Name_Id; Secondary_PCS_Project_File : File_Name_Type; debian/patches/disable-rtcorba-tests.patch0000644000000000000000000001225111761151277016044 0ustar --- a/Makefile.in +++ b/Makefile.in @@ -303,7 +303,7 @@ GEN_HTTP_BODY = ${top_srcdir}/src/soap/gen_http_body #???.exe suffix : gnatprfh.exe? -src/soap/polyorb-http_methods.adb: ${GEN_HTTP_BODY} compilers/gnatprfh/gnatprfh +src/soap/polyorb-http_methods.adb: ${GEN_HTTP_BODY} compilers/gnatprfh/gnatprfh # Note that the second gen_http_body command below overwrites perfect_hash.adb # with different content. @@ -620,23 +620,23 @@ # local.gpr should contain: # with "polyorb", "polyorb_test_common"; -# +# # project local is -# +# # Dir := external ("Test_Dir"); # Obj_Dir := PolyORB_Test_Common.Build_Dir & Dir; # for Object_Dir use Obj_Dir; # for Source_Dirs use (Obj_Dir, PolyORB_Test_Common.Source_Dir & Dir); -# +# # package Compiler is -# +# # for Default_Switches ("Ada") # use PolyORB_Test_Common.Compiler'Default_Switches ("Ada"); -# +# # end Compiler; -# +# # for Main use (<...>); -# +# # end local; # The only variable part is the Mains. @@ -699,7 +699,19 @@ active_tests := ${filter-out testsuite/corba/rtcorba/%,${active_tests}} endif +# disable rtcorba tests +active_tests := ${filter-out examples/corba/rtcorba/%,${active_tests}} +active_tests := ${filter-out examples/corba/rtcorba/rtcosscheduling/%,${active_tests}} +active_tests := ${filter-out examples/corba/rtcorba/dhb/%,${active_tests}} +active_tests := ${filter-out examples/corba/rtcorba/client_propagated/%,${active_tests}} +active_tests := ${filter-out examples/corba/rtcorba/server_declared/%,${active_tests}} +active_tests := ${filter-out testsuite/corba/rtcorba/%,${active_tests}} +active_tests := ${filter-out testsuite/corba/rtcorba/rtorb/%,${active_tests}} +active_tests := ${filter-out testsuite/corba/rtcorba/rtcurrent/%,${active_tests}} +active_tests := ${filter-out testsuite/corba/rtcorba/rtpoa/%,${active_tests}} + #???The following are disabled for now, because of minor build problems: +# and disable rtcorba tests skip_tests := examples/bbs \ examples/dsa \ testsuite/acats/CXE1001 \ @@ -707,7 +719,17 @@ testsuite/acats/CXE4001 \ testsuite/acats/CXE4002 \ testsuite/acats/CXE4005 \ - testsuite/acats/CXE4006 + testsuite/acats/CXE4006 \ + examples/corba/rtcorba \ + examples/corba/rtcorba/rtcosscheduling \ + examples/corba/rtcorba/dhb \ + examples/corba/rtcorba/client_propagated \ + examples/corba/rtcorba/server_declared \ + testsuite/corba/rtcorba \ + testsuite/corba/rtcorba/rtorb \ + testsuite/corba/rtcorba/rtcurrent \ + testsuite/corba/rtcorba/rtpoa + skip_tests := ${patsubst %,%/build-test,${skip_tests}} active_tests := ${filter-out ${skip_tests},${active_tests}} --- a/configure.ac +++ b/configure.ac @@ -531,7 +531,7 @@ AC_SUBST(LIBS_EXES) ########################################## -# gnatdist flags +# gnatdist flags ########################################## PCSNAME="polyorb" @@ -756,9 +756,9 @@ pragma Elaborate_All (${U}); pragma Warnings (Off, ${U}); EOF - + done - + for F in `${FIND} ${srcdir}/src/${P} -name 'polyorb-binding_data-*.ads'` do U=`${AWK} '/^package/{print $2}' ${F}` @@ -769,7 +769,7 @@ pragma Warnings (Off, ${U}); EOF done - + for F in `${FIND} ${srcdir}/src/${P} -name 'polyorb-setup-access_points-*.ads' \ | ${GREP} -v polyorb-setup-access_points-tlsiop.ads` do @@ -781,7 +781,7 @@ pragma Warnings (Off, ${U}); EOF done - + for F in `${FIND} ${srcdir}/tools/po_catref -name "polyorb-binding_data-${P}-*.ads"` do U=`${AWK} '/^package/{print $2}' ${F}` @@ -792,7 +792,7 @@ pragma Warnings (Off, ${U}); EOF done - + for F in `${FIND} ${srcdir}/tools/po_createref -name "polyorb-binding_data-${P}-*.ads"` do U=`${AWK} '/^package/{print $2}' ${F}` @@ -823,7 +823,7 @@ SEDCMD=["${SEDCMD} -e 's/[^ ].*SSLIOP/-- &/'"] fi - if test -e ${F}; then + if test -e ${F}; then eval "${SEDCMD}" < ${F} > ${F}.new mv ${F}.new ${F} fi @@ -842,7 +842,7 @@ LOCAL_MAKEFILES=config.local.makefiles -(cd ${srcdir} && find . -name Makefile.local) | sed "s,^\./,," | sort | \ +(cd ${srcdir} && find . -name Makefile.local) | sed "s,^\./,," | sort | grep -v rtcorba | \ while read mklocal; do testdir="`dirname ${mklocal}`/" echo "current_dir := ${testdir}" --- a/testsuite/testsuite.py +++ b/testsuite/testsuite.py @@ -85,8 +85,16 @@ test_glob = m.args[0] else: test_glob = None - test_list = filter_list('./tests/*/*/*/test.py', test_glob) + first_test_list = filter_list('./tests/*/*/*/test.py', test_glob) + test_list = [] + exclude_rt = 'rtcorba' # exclude rtcorba directories + exclude_secure= 'secure_echo' # exclude secure directories + for item in first_test_list: + if exclude_rt not in item and exclude_secure not in item: + test_list.append (item) + else: + print ("remove test " + item) collect_result = generate_collect_result( m.options.output_dir, results_file, m.options.diffs) run_testcase = generate_run_testcase('tests/run-test.py', debian/patches/disable-corba-miop-test.patch0000644000000000000000000000116411761151277016256 0ustar Author: Reto Buerki Description: Disable CORBA/MIOP test. This test does not work reliably on the various build hosts of the Debian autobuilder network. Bug-Debian: http://bugs.debian.org/571436 --- a/testsuite/scenarios/examples-corba-send.conf +++ /dev/null @@ -1,15 +0,0 @@ -[scenario] -name=CORBA_MIOP -id=CORBA/MIOP test - -[test CORBA_MIOP_0] -id=Simple test -type=client_server - -[client CORBA_MIOP_0] -command=../examples/corba/send/send -config_file=scenarios/polyorb_conf/miop.conf - -[server CORBA_MIOP_0] -command=../examples/corba/send/listener -config_file=scenarios/polyorb_conf/miop.conf debian/patches/debian-testsuite-adaptation.patch0000644000000000000000000000132511761151277017242 0ustar --- a/testsuite/tests/test_utils.py +++ b/testsuite/tests/test_utils.py @@ -98,7 +98,7 @@ try: # Run the server command and retrieve the IOR string - p_cmd_server = ['rlimit', str(RLIMIT), server] + p_cmd_server = ['gnatpython-rlimit', str(RLIMIT), server] server_handle = Popen(p_cmd_server, stdout=PIPE, env=server_env) if VERBOSE: print 'RUN: POLYORB_CONF=%s %s' % \ --- a/projects/polyorb_test_common.gpr +++ b/projects/polyorb_test_common.gpr @@ -33,7 +33,7 @@ for Source_Files use (); - Build_Dir := PolyORB_Common.Build_Dir; + Build_Dir := PolyORB_Common.Build_Dir & "../"; Source_Dir := PolyORB_Common.Source_Dir; package Compiler is debian/patches/makefile-install-target.patch0000644000000000000000000001101111761151277016345 0ustar --- a/Makefile.in +++ b/Makefile.in @@ -825,39 +825,39 @@ prefix=@prefix@ +debian_source_dir = ${prefix}/share/ada/adainclude/polyorb +debian_ali_dir = ${prefix}/lib/ada/adalib/polyorb +debian_bin_dir = ${prefix}/bin +debian_lib_dir = ${prefix}/lib + .PHONY: install install: all - @echo "Install prefix: ${prefix}" - @echo " Sources dir: ${top_srcdir}" - @echo " Build dir: ${top_builddir}" - ${INSTALL} -d ${prefix}/bin - ${RM} -fr "${prefix}/lib/gnat/polyorb" - ${INSTALL} -d ${prefix}/lib/gnat/polyorb - ${INSTALL} -d ${prefix}/lib/polyorb - ${INSTALL} -d ${prefix}/lib/polyorb/static - ${RM} -fr "${prefix}/include/polyorb" - ${INSTALL} -d ${prefix}/include/polyorb + ${INSTALL} -d ${debian_lib_dir} + ${INSTALL} -d ${debian_bin_dir} + ${INSTALL} -d ${debian_source_dir} + ${INSTALL} -d ${debian_ali_dir} for comp in ${COMPILER_EXES}; do \ - ${INSTALL_BIN} ${top_builddir}/compilers/$${comp}${COMPILER_EXE_SUFFIX} ${prefix}/bin; \ + : Do not distribute the gnatprfh binary; \ + if [ `basename $${comp}` = gnatprfh ]; then \ + continue; \ + fi; \ + ${INSTALL} ${top_builddir}/compilers/$${comp}${COMPILER_EXE_SUFFIX} ${debian_bin_dir}; \ : Special case, symlink iac as idlac for backwards compatibility; \ if [ `basename $${comp}` = iac ]; then \ (cd ${prefix}/bin && ${RM} -f idlac${TOOL_EXE_SUFFIX} && ${LN_S} iac${TOOL_EXE_SUFFIX} idlac${TOOL_EXE_SUFFIX}); \ fi; \ done - ${INSTALL_BIN} ${top_builddir}/tools/po_cos_naming/po_cos_naming${TOOL_EXE_SUFFIX} ${prefix}/bin - ${INSTALL_BIN} ${top_builddir}/tools/po_cos_naming/po_cos_naming_shell${TOOL_EXE_SUFFIX} ${prefix}/bin - ${INSTALL_BIN} ${top_builddir}/tools/po_cos_naming/ir_ab_names${TOOL_EXE_SUFFIX} ${prefix}/bin - ${INSTALL_BIN} ${top_builddir}/tools/po_ir/po_ir${TOOL_EXE_SUFFIX} ${prefix}/bin - ${INSTALL_BIN} ${top_builddir}/tools/po_catref/po_catref${TOOL_EXE_SUFFIX} ${prefix}/bin - ${INSTALL_BIN} ${top_builddir}/tools/po_createref/po_createref${TOOL_EXE_SUFFIX} ${prefix}/bin - ${INSTALL_BIN} ${top_builddir}/tools/po_names/po_names${TOOL_EXE_SUFFIX} ${prefix}/bin - ${INSTALL_BIN} ${top_builddir}/tools/po_dumpir/po_dumpir${TOOL_EXE_SUFFIX} ${prefix}/bin - ${INSTALL_SCRIPT} ${top_builddir}/polyorb-config ${prefix}/bin - ls ${top_builddir}/lib/*.a | ${XARGS_I} ${INSTALL} -m 444 {} ${prefix}/lib/polyorb/static - ls ${top_srcdir}/projects-distrib/*.gpr | ${XARGS_I} ${INSTALL} -m 444 {} ${prefix}/lib/gnat - ls ${top_builddir}/projects-distrib/*.gpr | ${XARGS_I} ${INSTALL} -m 444 {} ${prefix}/lib/gnat - ls ${top_srcdir}/projects-distrib/polyorb/*.gpr | ${XARGS_I} ${INSTALL} -m 444 {} ${prefix}/lib/gnat/polyorb - ls ${top_builddir}/projects-distrib/polyorb/*.gpr | ${XARGS_I} ${INSTALL} -m 444 {} ${prefix}/lib/gnat/polyorb + ${INSTALL} ${top_builddir}/polyorb-config ${debian_bin_dir} + ${INSTALL} ${top_builddir}/DYNAMIC/tools/po_cos_naming/po_cos_naming${TOOL_EXE_SUFFIX} ${debian_bin_dir} + ${INSTALL} ${top_builddir}/DYNAMIC/tools/po_cos_naming/po_cos_naming_shell${TOOL_EXE_SUFFIX} ${debian_bin_dir} + ${INSTALL} ${top_builddir}/DYNAMIC/tools/po_cos_naming/ir_ab_names${TOOL_EXE_SUFFIX} ${debian_bin_dir} + ${INSTALL} ${top_builddir}/DYNAMIC/tools/po_ir/po_ir${TOOL_EXE_SUFFIX} ${debian_bin_dir} + ${INSTALL} ${top_builddir}/DYNAMIC/tools/po_catref/po_catref${TOOL_EXE_SUFFIX} ${debian_bin_dir} + ${INSTALL} ${top_builddir}/DYNAMIC/tools/po_createref/po_createref${TOOL_EXE_SUFFIX} ${debian_bin_dir} + ${INSTALL} ${top_builddir}/DYNAMIC/tools/po_names/po_names${TOOL_EXE_SUFFIX} ${debian_bin_dir} + ${INSTALL} ${top_builddir}/DYNAMIC/tools/po_dumpir/po_dumpir${TOOL_EXE_SUFFIX} ${debian_bin_dir} + ls ${top_builddir}/STATIC/lib/*.a | ${XARGS_I} ${INSTALL} -m 444 {} ${debian_lib_dir} + ls ${top_builddir}/DYNAMIC/lib/*.so.* | ${XARGS_I} ${INSTALL} -m 444 {} ${debian_lib_dir} (find \ ${top_builddir}/src \ ${top_builddir}/cos \ @@ -866,14 +866,14 @@ ${top_srcdir}/cos \ ${top_srcdir}/idls \ -name '*.ads' -o -name '*.adb' -o -name '*.idl') | \ - ${XARGS_I} ${INSTALL} -m 444 {} ${prefix}/include/polyorb + ${XARGS_I} ${INSTALL} -m 444 {} ${debian_source_dir} (find \ - ${top_builddir}/ali \ + ${top_builddir}/DYNAMIC/ali \ -name '*.ali' \ -a ! -name 'polyorb-dsa_p-partitions.ali' \ -a ! -name 'polyorb-dsa_p-storages-config.ali' \ -a ! -name 'polyorb-partition_elaboration.ali') | \ - ${XARGS_I} ${INSTALL} -m 444 {} ${prefix}/lib/polyorb + ${XARGS_I} ${INSTALL} -m 444 {} ${debian_ali_dir} # Install documentation only if it has been built locally, or # pre-built and packaged with sources. if [ -r docs/polyorb_ug.html ]; \ debian/patches/remove-soap-in-tests.patch0000644000000000000000000000656411761151277015662 0ustar --- a/testsuite/tests/examples/corba-echo/ECHO_1/test.py +++ b/testsuite/tests/examples/corba-echo/ECHO_1/test.py @@ -2,7 +2,7 @@ from test_utils import * import sys -if not client_server(r'../examples/corba/echo/client', r'soap.conf', - r'../examples/corba/echo/server', r'soap.conf'): +if not client_server(r'../examples/corba/echo/client', r'giop.conf', + r'../examples/corba/echo/server', r'giop.conf'): fail() --- a/testsuite/tests/examples/corba-all_functions/ALL_FUNCTIONS_1/test.py +++ b/testsuite/tests/examples/corba-all_functions/ALL_FUNCTIONS_1/test.py @@ -2,7 +2,7 @@ from test_utils import * import sys -if not client_server(r'../examples/corba/all_functions/client', r'soap.conf', - r'../examples/corba/all_functions/server', r'soap.conf'): +if not client_server(r'../examples/corba/all_functions/client', r'giop.conf', + r'../examples/corba/all_functions/server', r'giop.conf'): fail() --- a/testsuite/tests/examples/corba-echo/ECHO_3/test.py +++ b/testsuite/tests/examples/corba-echo/ECHO_3/test.py @@ -2,7 +2,7 @@ from test_utils import * import sys -if not client_server(r'../examples/corba/echo/dynclient', r'soap.conf', - r'../examples/corba/echo/server', r'soap.conf'): +if not client_server(r'../examples/corba/echo/dynclient', r'giop.conf', + r'../examples/corba/echo/server', r'giop.conf'): fail() --- a/testsuite/tests/examples/corba-all_functions/ALL_FUNCTIONS_3/test.py +++ b/testsuite/tests/examples/corba-all_functions/ALL_FUNCTIONS_3/test.py @@ -2,7 +2,7 @@ from test_utils import * import sys -if not client_server(r'../examples/corba/all_functions/dynclient', r'soap.conf', - r'../examples/corba/all_functions/server', r'soap.conf'): +if not client_server(r'../examples/corba/all_functions/dynclient', r'giop.conf', + r'../examples/corba/all_functions/server', r'giop.conf'): fail() --- a/testsuite/tests/examples/corba-all_types/ALL_TYPES_1/test.py +++ b/testsuite/tests/examples/corba-all_types/ALL_TYPES_1/test.py @@ -5,11 +5,11 @@ r1, r2 = ( client_server( r'../examples/corba/all_types/client', - r'soap.conf', + r'giop.conf', r'../examples/corba/all_types/server', - r'soap.conf'), + r'giop.conf'), local( r'../examples/corba/all_types/client', - r'soap.conf', args=['local'])) + r'giop.conf', args=['local'])) if not r1 or not r2: fail() --- a/testsuite/tests/examples/corba-all_types/ALL_TYPES_3/test.py +++ b/testsuite/tests/examples/corba-all_types/ALL_TYPES_3/test.py @@ -4,8 +4,8 @@ if not client_server( r'../examples/corba/all_types/dynclient', - r'soap.conf', + r'giop.conf', r'../examples/corba/all_types/server', - r'soap.conf'): + r'giop.conf'): fail() --- a/testsuite/tests/examples/corba-random/CORBA_RANDOM_1/test.py +++ b/testsuite/tests/examples/corba-random/CORBA_RANDOM_1/test.py @@ -2,7 +2,7 @@ from test_utils import * import sys -if not client_server(r'../examples/corba/random/client', r'soap.conf', - r'../examples/corba/random/server', r'soap.conf'): +if not client_server(r'../examples/corba/random/client', r'giop.conf', + r'../examples/corba/random/server', r'giop.conf'): fail() debian/patches/fix-assert-failure-gnatdist.patch0000644000000000000000000000163711761151277017202 0ustar --- a/compilers/gnatdist/xe_back-polyorb.adb +++ b/compilers/gnatdist/xe_back-polyorb.adb @@ -671,13 +671,11 @@ if Remote.Reconnection /= No_Reconnection then U := Remote.First_Unit; while U /= No_Conf_Unit_Id loop - if Units.Table (Conf_Units.Table (U).My_Unit).RCI then - Key := Attribute_Name (U, Reconnection); - Set_Conf - (Section, Key, - Reconnection_Img (Remote.Reconnection), - Quote => True); - end if; + Key := Attribute_Name (U, Reconnection); + Set_Conf + (Section, Key, + Reconnection_Img (Remote.Reconnection), + Quote => True); U := Conf_Units.Table (U).Next_Unit; end loop; end if; debian/patches/enable-dynamic-libs-build.patch0000644000000000000000000004716211761151277016554 0ustar --- a/projects/polyorb_common.gpr +++ b/projects/polyorb_common.gpr @@ -33,6 +33,10 @@ type Build_Type is ("PRODUCTION", "DEBUG"); Build : Build_Type := external ("Build", "PRODUCTION"); + type Lib_Type is ("STATIC", "DYNAMIC"); + Libtype : Lib_Type := external ("Libtype", "STATIC"); + + Warnings_Mode := external ("Warnings_Mode", "e"); -- Possible values: -- e: treat warnings as errors, default @@ -41,7 +45,7 @@ for Source_Files use (); - Build_Dir := PolyORB_Config.Top_Build_Dir; + Build_Dir := PolyORB_Config.Top_Build_Dir & "/" & Libtype & "/"; -- Used to set source, object, and ALI dirs of importing projects Source_Dir := PolyORB_Config.Top_Source_Dir; @@ -51,18 +55,32 @@ package Compiler is - Base_Ada_Compiler_Switches := - ("-gnat05", -- Ada 2005 mode - "-gnati1", -- Full ISO 8859-1 character set allowed in - -- source code (for generated CORBA stubs) - "-gnatf", -- Full compiler error messages - Cfg_Pragmas_Switch, -- Configuration pragmas from configure - PolyORB_Config.Style_Switch, -- Enable style checks - "-gnatwal" & Warnings_Mode); - -- Enable all warnings, also enable elaboration + Base_Ada_Compiler_Switches := (""); + case Libtype is + when "STATIC" => + Base_Ada_Compiler_Switches := Base_Ada_Compiler_Switches & + ("-gnat05", -- Ada 2005 mode + "-gnati1", -- Full ISO 8859-1 character set allowed in + -- source code (for generated CORBA stubs) + "-gnatf", -- Full compiler error messages + PolyORB_Config.Style_Switch, -- Enable style checks + "-gnatwal" & Warnings_Mode); + -- Enable all warnings, also enable elaboration + -- warnings, and treat all warnings as errors + -- if Warnings_As_Errors is set to "e". + when "DYNAMIC" => + Base_Ada_Compiler_Switches := Base_Ada_Compiler_Switches & + ("-gnat05", -- Ada 2005 mode + "-fPIC", -- flag for shared lib under debian + "-gnati1", -- Full ISO 8859-1 character set allowed in + -- source code (for generated CORBA stubs) + "-gnatf", -- Full compiler error messages + PolyORB_Config.Style_Switch, -- Enable style checks + "-gnatwal" & Warnings_Mode); + -- Enable all warnings, also enable elaboration -- warnings, and treat all warnings as errors -- if Warnings_As_Errors is set to "e". - + end case; case Build is when "PRODUCTION" => for Default_Switches ("Ada") use --- a/projects/polyorb_src_setup.gpr.in +++ b/projects/polyorb_src_setup.gpr.in @@ -48,7 +48,7 @@ for Library_Name use "polyorb-setup"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_setup"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_cos_event.gpr +++ b/projects/polyorb_cos_event.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-corba-cos-event-impl"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/cos_event"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_cos_ir.gpr +++ b/projects/polyorb_cos_ir.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-corba-cos-ir-impl"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/cos_ir"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_cos_naming.gpr +++ b/projects/polyorb_cos_naming.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-corba-cos-naming-impl"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/cos_naming"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_cos_notification.gpr +++ b/projects/polyorb_cos_notification.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-corba-cos-notification-impl"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/cos_notification"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_cos_time.gpr +++ b/projects/polyorb_cos_time.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-corba-cos-time-impl"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/cos_time"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_idls_cos_event.gpr +++ b/projects/polyorb_idls_cos_event.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-corba-cos-event"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/idls_cos_event"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_idls_cos_naming.gpr +++ b/projects/polyorb_idls_cos_naming.gpr @@ -38,7 +38,7 @@ for Library_Name use "polyorb-corba-cos-naming"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/idls_cos_naming"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_idls_cos_notification.gpr +++ b/projects/polyorb_idls_cos_notification.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-corba-cos-notification"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/idls_cos_notification"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_idls_cos_time.gpr +++ b/projects/polyorb_idls_cos_time.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-corba-cos-time"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/idls_cos_time"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src.gpr +++ b/projects/polyorb_src.gpr @@ -39,7 +39,7 @@ for Library_Name use "polyorb"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_aws.gpr +++ b/projects/polyorb_src_aws.gpr @@ -33,12 +33,12 @@ Dir := "src/aws"; Obj_Dir := PolyORB_Common.Build_Dir & Dir; for Object_Dir use Obj_Dir; - for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir, Common.Source_Dir & "src/aws_orig"); + for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir, PolyORB_Common.Source_Dir & "src/aws_orig"); for Library_Name use "polyorb-aws"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_aws"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_corba.gpr +++ b/projects/polyorb_src_corba.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-corba"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_corba"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_corba_dynamicany.gpr +++ b/projects/polyorb_src_corba_dynamicany.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-corba-dynamicany"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_corba_dynamicany"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_corba_iop.gpr +++ b/projects/polyorb_src_corba_iop.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-corba-iop"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_corba_iop"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_corba_messaging.gpr +++ b/projects/polyorb_src_corba_messaging.gpr @@ -33,14 +33,15 @@ Obj_Dir := PolyORB_Common.Build_Dir & Dir; for Object_Dir use Obj_Dir; - for Source_Dirs use (Obj_Dir); - -- for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - -- Only generated sources, no sources from repository + -- for Source_Dirs use (Obj_Dir); + for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); + -- Only generated sources, no sources from repository, but Obj_Dir now + -- points to STATIC and DYNAMIC dirs... for Library_Name use "polyorb-corba-messaging"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_corba_messaging"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_corba_portableinterceptor.gpr +++ b/projects/polyorb_src_corba_portableinterceptor.gpr @@ -41,7 +41,7 @@ for Library_Name use "polyorb-corba-portableinterceptor"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_corba_portableinterceptor"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_corba_rtcorba.gpr +++ b/projects/polyorb_src_corba_rtcorba.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-corba-rtcorba"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_corba_rtcorba"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_corba_security.gpr +++ b/projects/polyorb_src_corba_security.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-corba-security"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_corba_security"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_corba_security_gssup.gpr +++ b/projects/polyorb_src_corba_security_gssup.gpr @@ -40,7 +40,7 @@ for Library_Name use "polyorb-corba-security-gssup"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_corba_security_gssup"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_dns.gpr +++ b/projects/polyorb_src_dns.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-dns"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_dns"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_dns_mdns.gpr +++ b/projects/polyorb_src_dns_mdns.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-dns-mdns"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_dns_mdns"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_dns_udns.gpr +++ b/projects/polyorb_src_dns_udns.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-dns-udns"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_dns_udns"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_dsa.gpr +++ b/projects/polyorb_src_dsa.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-dsa"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_dsa"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_giop.gpr +++ b/projects/polyorb_src_giop.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-giop"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_giop"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_giop_diop.gpr +++ b/projects/polyorb_src_giop_diop.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-giop-diop"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_giop_diop"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_giop_iiop.gpr +++ b/projects/polyorb_src_giop_iiop.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-giop-iiop"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_giop_iiop"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_giop_iiop_security.gpr +++ b/projects/polyorb_src_giop_iiop_security.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-giop-iiop-security"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_giop_iiop_security"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_giop_iiop_security_tls.gpr +++ b/projects/polyorb_src_giop_iiop_security_tls.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-giop-iiop-security-tls"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_giop_iiop_security_tls"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_giop_iiop_ssliop.gpr +++ b/projects/polyorb_src_giop_iiop_ssliop.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-giop-iiop-ssliop"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_giop_iiop_ssliop"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_giop_miop.gpr +++ b/projects/polyorb_src_giop_miop.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-giop-miop"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_giop_miop"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_moma.gpr +++ b/projects/polyorb_src_moma.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-moma"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_moma"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_security.gpr +++ b/projects/polyorb_src_security.gpr @@ -39,7 +39,7 @@ for Library_Name use "polyorb-security"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_security"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_security_gssup.gpr +++ b/projects/polyorb_src_security_gssup.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-security-gssup"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_security_gssup"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_security_tls.gpr +++ b/projects/polyorb_src_security_tls.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-security-tls"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_security_tls"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_security_x509.gpr +++ b/projects/polyorb_src_security_x509.gpr @@ -39,7 +39,7 @@ for Library_Name use "polyorb-security-x509"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_security_x509"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_setup_security.gpr +++ b/projects/polyorb_src_setup_security.gpr @@ -41,7 +41,7 @@ for Library_Name use "polyorb-setup-security"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_setup_security"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_soap.gpr +++ b/projects/polyorb_src_soap.gpr @@ -39,7 +39,7 @@ for Library_Name use "polyorb-soap"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_soap"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_srp.gpr +++ b/projects/polyorb_src_srp.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-srp"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_srp"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_ssl.gpr +++ b/projects/polyorb_src_ssl.gpr @@ -39,7 +39,7 @@ for Library_Name use "polyorb-ssl"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_ssl"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is --- a/projects/polyorb_src_web_common.gpr +++ b/projects/polyorb_src_web_common.gpr @@ -37,7 +37,7 @@ for Library_Name use "polyorb-web_common"; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_web_common"; - for Library_Kind use "static"; + for Library_Kind use PolyORB_Common.Libtype; package Compiler is debian/patches/debianize-polyorb-config-in.patch0000644000000000000000000000206011761151277017131 0ustar --- a/polyorb-config.in +++ b/polyorb-config.in @@ -29,12 +29,7 @@ exec_prefix=`cygpath -w $exec_prefix` esac -if [ -f "${exec_prefix}"/include/polyorb/polyorb.ads ]; then - prefix="${exec_prefix}" -else - # Fall back to configure-time prefix - prefix="@prefix@" -fi +prefix="/usr" have_gnatmake_aPdir=@HAVE_GNATMAKE_APDIR@ default_appli="@APPLI_LIST@" @@ -184,10 +179,10 @@ done exec_prefix="@exec_prefix@" -includedir="@includedir@" -libdir="@libdir@" +includedir="/usr/share/ada/adainclude" +libdir="/usr/lib/ada/adalib" polyorb_dir="${includedir}/polyorb" -polyorb_lib="@LDFLAGS@ -L${libdir}/polyorb/static -lpolyorb" +polyorb_lib="@LDFLAGS@ -L/usr/lib -lpolyorb" corba_idl_dir="-I${includedir}/polyorb" for P in $appli; do @@ -267,7 +262,7 @@ fi if test x$have_gnatmake_aPdir = xyes; then - apdir="-aP${prefix}/lib/gnat" + apdir="-aP/usr/share/ada/adainclude" fi if test ! x"$echo_prefix" = x"true" -a ! x"$echo_exec_prefix" = x"true" -a ! x"$echo_cflags" = x"true" -a ! x"$echo_libs" = x"true" -a ! x"$echo_idls" = x"true"; then debian/patches/enforce-local-network-use.patch0000644000000000000000000000440511761151277016643 0ustar --- a/testsuite/tests/confs/code_sets_000_client.conf +++ b/testsuite/tests/confs/code_sets_000_client.conf @@ -1,3 +1,5 @@ [iiop] polyorb.protocols.iiop.giop.1.2.locate_then_request=false +polyorb.protocols.iiop.default_addr=127.0.0.1 +# to be sure we use local network \ No newline at end of file --- a/testsuite/tests/confs/giop.conf +++ b/testsuite/tests/confs/giop.conf @@ -10,3 +10,9 @@ binding_data.srp=disable binding_data.soap=disable binding_data.iiop=enable + +[iiop] +polyorb.protocols.iiop.default_addr=127.0.0.1 +[diop] +polyorb.protocols.diop.default_addr=127.0.0.1 +#to be sure that we use local network --- a/testsuite/tests/confs/giop_1_0.conf +++ b/testsuite/tests/confs/giop_1_0.conf @@ -4,6 +4,8 @@ [iiop] polyorb.protocols.iiop.giop.default_version.major=1 polyorb.protocols.iiop.giop.default_version.minor=0 +polyorb.protocols.iiop.default_addr=127.0.0.1 +#to be sure that we use local network [access_points] srp=disable --- a/testsuite/tests/confs/giop_1_1.conf +++ b/testsuite/tests/confs/giop_1_1.conf @@ -4,6 +4,8 @@ [iiop] polyorb.protocols.iiop.giop.default_version.major=1 polyorb.protocols.iiop.giop.default_version.minor=1 +polyorb.protocols.iiop.default_addr=127.0.0.1 +#to be sure that we use local network [access_points] srp=disable --- a/testsuite/tests/confs/giop_1_2.conf +++ b/testsuite/tests/confs/giop_1_2.conf @@ -4,6 +4,8 @@ [iiop] polyorb.protocols.iiop.giop.default_version.major=1 polyorb.protocols.iiop.giop.default_version.minor=2 +polyorb.protocols.iiop.default_addr=127.0.0.1 +#to be sure that we use local network [access_points] srp=disable --- a/testsuite/tests/confs/performance.conf +++ b/testsuite/tests/confs/performance.conf @@ -8,3 +8,6 @@ polyorb.protocols.iiop.giop.1.2.max_message_size=1000000 # Increase to a very big value to limit the effect of fragmentation + +polyorb.protocols.iiop.default_addr=127.0.0.1 +#to be sure that we use local network \ No newline at end of file --- a/testsuite/tests/confs/ssliop.conf +++ b/testsuite/tests/confs/ssliop.conf @@ -24,3 +24,4 @@ polyorb.protocols.ssliop.disable_unprotected_invocations=true polyorb.protocols.ssliop.verify=true polyorb.protocols.ssliop.verify_fail_if_no_peer_cert=true +polyorb.protocols.ssliop.default_addr=127.0.0.1 \ No newline at end of file debian/patches/link-polyorb-setup-with-services.patch0000644000000000000000000000034011761151277020214 0ustar --- a/projects/polyorb_src_setup.gpr.in +++ b/projects/polyorb_src_setup.gpr.in @@ -37,6 +37,7 @@ @NO_SSL@with "polyorb_src_ssl"; @WITH_PROTO_PRJS@ @WITH_APPLI_PRJS@ +@WITH_SERVICE_PRJS@ project PolyORB_src_setup is debian/patches/bug-562342.patch0000644000000000000000000001664711761151277013204 0ustar --- /dev/null +++ b/testsuite/scenarios/polyorb_conf/localhost_defaults.conf @@ -0,0 +1,5 @@ +[iiop] +polyorb.protocols.iiop.default_addr=127.0.0.1 + +[diop] +polyorb.protocols.diop.default_addr=127.0.0.1 --- a/testsuite/scenarios/corba-all_exceptions.conf +++ b/testsuite/scenarios/corba-all_exceptions.conf @@ -11,6 +11,7 @@ [server CORBA_ALL_EXCEPTIONS_0] command=corba/all_exceptions/server +config_file=scenarios/polyorb_conf/localhost_defaults.conf [test CORBA_ALL_EXCEPTIONS_1] id=Exceptions test, using GIOP 1.0 protocol --- a/testsuite/scenarios/polyorb_conf/giop.conf +++ b/testsuite/scenarios/polyorb_conf/giop.conf @@ -10,3 +10,6 @@ binding_data.srp=disable binding_data.soap=disable binding_data.iiop=enable + +[iiop] +polyorb.protocols.iiop.default_addr=127.0.0.1 --- a/testsuite/scenarios/polyorb_conf/giop_1_0.conf +++ b/testsuite/scenarios/polyorb_conf/giop_1_0.conf @@ -4,6 +4,7 @@ [iiop] polyorb.protocols.iiop.giop.default_version.major=1 polyorb.protocols.iiop.giop.default_version.minor=0 +polyorb.protocols.iiop.default_addr=127.0.0.1 [access_points] srp=disable --- a/testsuite/scenarios/polyorb_conf/giop_1_1.conf +++ b/testsuite/scenarios/polyorb_conf/giop_1_1.conf @@ -4,6 +4,7 @@ [iiop] polyorb.protocols.iiop.giop.default_version.major=1 polyorb.protocols.iiop.giop.default_version.minor=1 +polyorb.protocols.iiop.default_addr=127.0.0.1 [access_points] srp=disable --- a/testsuite/scenarios/polyorb_conf/giop_1_2.conf +++ b/testsuite/scenarios/polyorb_conf/giop_1_2.conf @@ -4,6 +4,7 @@ [iiop] polyorb.protocols.iiop.giop.default_version.major=1 polyorb.protocols.iiop.giop.default_version.minor=2 +polyorb.protocols.iiop.default_addr=127.0.0.1 [access_points] srp=disable --- a/testsuite/scenarios/corba-benchs.conf +++ b/testsuite/scenarios/corba-benchs.conf @@ -12,3 +12,4 @@ [server CORBA_BENCHS_0] command=corba/benchs/test000/server +config_file=scenarios/polyorb_conf/localhost_defaults.conf --- a/testsuite/scenarios/polyorb_conf/code_sets_000_server.conf +++ b/testsuite/scenarios/polyorb_conf/code_sets_000_server.conf @@ -1,3 +1,6 @@ [giop] giop.native_wchar_code_set=16#00040001# + +[iiop] +polyorb.protocols.iiop.default_addr=127.0.0.1 --- a/testsuite/scenarios/corba-domainmanager.conf +++ b/testsuite/scenarios/corba-domainmanager.conf @@ -11,3 +11,4 @@ [server DOMAINMANAGER_0] command=corba/domainmanager/test000/server +config_file=scenarios/polyorb_conf/localhost_defaults.conf --- a/testsuite/scenarios/corba-harness.conf +++ b/testsuite/scenarios/corba-harness.conf @@ -12,6 +12,7 @@ [server CORBA_HARNESS_0] command=corba/harness/server_no_tasking +config_file=scenarios/polyorb_conf/localhost_defaults.conf [test CORBA_HARNESS_1] id=Harness, tasking, threadpool @@ -23,6 +24,7 @@ [server CORBA_HARNESS_1] command=corba/harness/server_thread_pool +config_file=scenarios/polyorb_conf/localhost_defaults.conf [test CORBA_HARNESS_2] id=Harness, tasking, thread per request @@ -34,6 +36,7 @@ [server CORBA_HARNESS_2] command=corba/harness/server_thread_per_request +config_file=scenarios/polyorb_conf/localhost_defaults.conf [test CORBA_HARNESS_3] id=Harness, tasking, thread per session @@ -45,6 +48,7 @@ [server CORBA_HARNESS_3] command=corba/harness/server_thread_per_session +config_file=scenarios/polyorb_conf/localhost_defaults.conf [test CORBA_HARNESS_5] id=Harness, tasking, leader/followers @@ -56,6 +60,7 @@ [server CORBA_HARNESS_5] command=corba/harness/server_thread_pool_lf +config_file=scenarios/polyorb_conf/localhost_defaults.conf [test CORBA_HARNESS_6] id=Harness, tasking, half sync/half async @@ -67,6 +72,7 @@ [server CORBA_HARNESS_6] command=corba/harness/server_thread_pool_hahs +config_file=scenarios/polyorb_conf/localhost_defaults.conf [test CORBA_HARNESS_7] id=Harness, local test --- a/testsuite/scenarios/corba-location_forwarding.conf +++ b/testsuite/scenarios/corba-location_forwarding.conf @@ -16,3 +16,4 @@ [server LOCATION_FORWARDING_1] command=corba/location_forwarding/test001/test001_server +config_file=scenarios/polyorb_conf/localhost_defaults.conf --- a/testsuite/scenarios/corba-object.conf +++ b/testsuite/scenarios/corba-object.conf @@ -11,3 +11,4 @@ [server OBJECT_0] command=corba/object/test000/test000_server +config_file=scenarios/polyorb_conf/localhost_defaults.conf --- a/testsuite/scenarios/polyorb_conf/performance.conf +++ b/testsuite/scenarios/polyorb_conf/performance.conf @@ -2,7 +2,7 @@ # PolyORB configuration file for benchmarking CORBA application [iiop] - +polyorb.protocols.iiop.default_addr=127.0.0.1 polyorb.protocols.iiop.giop.1.2.locate_then_request=false # Disable Locate messages --- a/testsuite/scenarios/corba-portableinterceptor.conf +++ b/testsuite/scenarios/corba-portableinterceptor.conf @@ -32,3 +32,4 @@ [server CORBA_PORTABLEINTERCEPTOR_4] command=corba/portableinterceptor/test004/server +config_file=scenarios/polyorb_conf/localhost_defaults.conf --- a/testsuite/scenarios/core-sync_policies.conf +++ b/testsuite/scenarios/core-sync_policies.conf @@ -11,3 +11,4 @@ [server CORE_SYNC_POLICIES_0] command=core/sync_policies/server_no_tasking +config_file=scenarios/polyorb_conf/localhost_defaults.conf --- a/testsuite/scenarios/cos-ir.conf +++ b/testsuite/scenarios/cos-ir.conf @@ -11,3 +11,4 @@ [server IR_0] command=corba/cos/ir/server +config_file=scenarios/polyorb_conf/localhost_defaults.conf --- a/testsuite/scenarios/cos-naming.conf +++ b/testsuite/scenarios/cos-naming.conf @@ -11,3 +11,4 @@ [server NAMING_0] command=../tools/po_cos_naming/po_cos_naming +config_file=scenarios/polyorb_conf/localhost_defaults.conf --- a/testsuite/scenarios/examples-corba-all_functions.conf +++ b/testsuite/scenarios/examples-corba-all_functions.conf @@ -11,6 +11,7 @@ [server ALL_FUNCTIONS_0] command=../examples/corba/all_functions/server +config_file=scenarios/polyorb_conf/localhost_defaults.conf [test ALL_FUNCTIONS_1] id=All_Functions test, using SOAP personality. @@ -35,6 +36,7 @@ [server ALL_FUNCTIONS_2] command=../examples/corba/all_functions/server +config_file=scenarios/polyorb_conf/localhost_defaults.conf [test ALL_FUNCTIONS_3] id=All_Functions DII test, using SOAP personality. --- a/testsuite/scenarios/examples-corba-all_types.conf +++ b/testsuite/scenarios/examples-corba-all_types.conf @@ -11,6 +11,7 @@ [server ALL_TYPES_0] command=../examples/corba/all_types/server +config_file=scenarios/polyorb_conf/localhost_defaults.conf [test ALL_TYPES_1] id=All_Types test, using SOAP personality. @@ -35,6 +36,7 @@ [server ALL_TYPES_2] command=../examples/corba/all_types/server +config_file=scenarios/polyorb_conf/localhost_defaults.conf [test ALL_TYPES_3] id=All_Types DII test, using SOAP personality. --- a/testsuite/scenarios/examples-corba-echo.conf +++ b/testsuite/scenarios/examples-corba-echo.conf @@ -11,6 +11,7 @@ [server ECHO_0] command=../examples/corba/echo/server +config_file=scenarios/polyorb_conf/localhost_defaults.conf [test ECHO_2] id=Echo DII test, default configuration --- a/testsuite/scenarios/examples-corba-random.conf +++ b/testsuite/scenarios/examples-corba-random.conf @@ -11,3 +11,4 @@ [server CORBA_RANDOM_0] command=../examples/corba/random/server +config_file=scenarios/polyorb_conf/localhost_defaults.conf --- a/testsuite/scenarios/polyorb_conf/miop.conf +++ b/testsuite/scenarios/polyorb_conf/miop.conf @@ -14,3 +14,6 @@ polyorb.miop.multicast_addr=239.239.239.18 polyorb.miop.multicast_port=5678 + +[iiop] +polyorb.protocols.iiop.default_addr=127.0.0.1 debian/patches/series0000644000000000000000000000221211761151277012037 0ustar fix-pi-get-effective-component.patch cos_naming-linkage.patch enable-dynamic-libs-build.patch makefile-install-target.patch fix-configure-ssl-protos.patch add-version-to-libraries.patch fix-manpage-has-errors-from-man.patch #make-run_tests-target-libtype-aware.patch replace-svnrevision-with-date.patch configure-local-makefile.patch debianize-polyorb-config-in.patch #polyorb-solve-powerpc-problem.patch add-linker-option.patch link-polyorb-setup-with-services.patch remove-rtcorba.patch #config_dsa.patch #short_unsigned_short.patch polyorb-config-patch-for-gnatdist.patch polyorb-config.patch cos_naming-linkage-testsuite.patch #disable-soap-echo.patch #disable-soap-random.patch disable-rtcorba-tests.patch #testsuite-combined-output.patch bug-561121.patch #bug-562192.patch #bug-562342.patch #disable-corba-miop-test.patch #NF_27_IC22_022.patch bug-581134.patch fix-assert-failure-gnatdist.patch handle-time-stamping-problem.patch debian-testsuite-adaptation.patch fix-texi-syntax-error.patch remove-soap-in-tests.patch enforce-local-network-use.patch remove-unsupported-tests.patch tests-static-adaptation.patch testsuite-enhancement.patch hardening.patch debian/patches/polyorb-solve-powerpc-problem.patch0000644000000000000000000000220311761151277017572 0ustar --- a/src/corba/polyorb-corba_p-exceptions.adb +++ b/src/corba/polyorb-corba_p-exceptions.adb @@ -248,7 +248,7 @@ -- Request_Raise_Occurrence -- ------------------------------ - procedure Request_Raise_Occurrence (R : in out Requests.Request_Access) is + procedure Request_Raise_Occurrence (R : Requests.Request_Access) is begin if not Any.Is_Empty (R.Exception_Info) then declare @@ -259,8 +259,6 @@ Get_Exception_Information (R); Last : Integer; begin - Requests.Destroy_Request (R); - -- Truncate exception information to first 150 characters if Exception_Information'Length <= 150 then --- a/src/corba/polyorb-corba_p-exceptions.ads +++ b/src/corba/polyorb-corba_p-exceptions.ads @@ -37,7 +37,7 @@ package PolyORB.CORBA_P.Exceptions is - procedure Request_Raise_Occurrence (R : in out Requests.Request_Access); + procedure Request_Raise_Occurrence (R : Requests.Request_Access); -- If R has non-empty exception information, call Raise_From_Any -- with an appropriate information message after having destroyed R. debian/patches/polyorb-config.patch0000644000000000000000000000111111761151277014571 0ustar --- a/polyorb-config.in +++ b/polyorb-config.in @@ -190,7 +190,7 @@ if [ "x$P" = "xcorba" ] then - polyorb_lib="$polyorb_lib -lpolyorb-corba-dynamicany -lpolyorb-corba-iop -lpolyorb-corba-messaging -lpolyorb-corba-portableinterceptor -lpolyorb-corba-rtcorba" + polyorb_lib="$polyorb_lib -lpolyorb-corba-dynamicany -lpolyorb-corba-iop -lpolyorb-corba-messaging -lpolyorb-corba-portableinterceptor" for S in $services; do # In general we have two libraries for each service: cos-${S} for client # stubs and helpers, and cos-${S}-impl for implementation. A user debian/patches/remove-unsupported-tests.patch0000644000000000000000000000201511761151277016667 0ustar --- a/testsuite/testsuite.py +++ b/testsuite/testsuite.py @@ -91,7 +91,19 @@ exclude_rt = 'rtcorba' # exclude rtcorba directories exclude_secure= 'secure_echo' # exclude secure directories for item in first_test_list: - if exclude_rt not in item and exclude_secure not in item: + cond1 = exclude_rt not in item + cond2 = exclude_secure not in item + cond3 = 'ALL_TYPES_4' not in item + cond4 = 'interop' not in item + cond5 = 'CORBA_PORTABLEINTERCEPTOR_1' not in item + cond6 = 'SHUTDOWN_1' not in item + cond7 = 'ALL_TYPES_2' not in item + cond8 = 'ALL_TYPES_3' not in item + cond9 = 'ALL_FUNCTIONS_3' not in item + cond10 = 'ALL_FUNCTIONS_2' not in item + cond11 = 'always_fail' not in item + all_cond = cond1 and cond2 and cond3 and cond4 and cond5 and cond6 and cond7 and cond8 and cond9 and cond10 and cond11 + if all_cond: test_list.append (item) else: print ("remove test " + item) debian/patches/bug-581134.patch0000644000000000000000000000277111761151277013175 0ustar Author : Xavier Grave Fix bug #581134, suppress three bashism about echo -e, replaced by printf --- a/examples/corba/secure_echo/gssup_example.in +++ b/examples/corba/secure_echo/gssup_example.in @@ -10,7 +10,7 @@ openssl genrsa -out polyorb.key 2048 openssl req -new -key polyorb.key -out polyorb.req \ -config ./polyorb_openssl.conf -echo -e "y\ny" | openssl ca -keyfile root.key -cert root.crt \ +printf "y\ny\n" | openssl ca -keyfile root.key -cert root.crt \ -in polyorb.req -out polyorb.crt \ -config ./ca_openssl.conf || true rm -rf .ca --- a/examples/corba/secure_echo/tls_example.in +++ b/examples/corba/secure_echo/tls_example.in @@ -10,7 +10,7 @@ openssl genrsa -out polyorb.key 2048 openssl req -new -key polyorb.key -out polyorb.req \ -config ./polyorb_openssl.conf -echo -e "y\ny" | openssl ca -keyfile root.key -cert root.crt \ +printf "y\ny\n" | openssl ca -keyfile root.key -cert root.crt \ -in polyorb.req -out polyorb.crt \ -config ./ca_openssl.conf || true rm -rf .ca --- a/examples/corba/secure_echo/tls_gssup_example.in +++ b/examples/corba/secure_echo/tls_gssup_example.in @@ -10,7 +10,7 @@ openssl genrsa -out polyorb.key 2048 openssl req -new -key polyorb.key -out polyorb.req \ -config ./polyorb_openssl.conf -echo -e "y\ny" | openssl ca -keyfile root.key -cert root.crt \ +printf "y\ny\n" | openssl ca -keyfile root.key -cert root.crt \ -in polyorb.req -out polyorb.crt \ -config ./ca_openssl.conf || true rm -rf .ca debian/patches/fix-configure-ssl-protos.patch0000644000000000000000000000226111761151277016537 0ustar --- a/configure.ac +++ b/configure.ac @@ -397,6 +397,13 @@ AC_SUBST(LIBS_LIST) ########################################## +# SSL/TLS Support with OpenSSL +########################################## + +AM_WITH_OPENSSL +AM_CONDITIONAL(HAVE_SSL, [test "x$HAVE_SSL" = "xyes"]) + +########################################## # Update Makefiles' subdirectory lists ########################################## @@ -405,8 +412,12 @@ result= sep="" for gpr in ${srcdir}/projects/polyorb_src_${perso_name}*.gpr; do - result="${result}${sep}\"`basename $gpr .gpr`\"" - sep="," + uses_ssl=`echo $gpr | grep -v security | grep -v ssl` + if test "$uses_ssl" != "" || test "x$HAVE_SSL" = xyes + then + result="${result}${sep}\"`basename $gpr .gpr`\"" + sep="," + fi done echo $result } @@ -634,13 +645,6 @@ fi ########################################## -# SSL/TLS Support with OpenSSL -########################################## - -AM_WITH_OPENSSL -AM_CONDITIONAL(HAVE_SSL, [test "x$HAVE_SSL" = "xyes"]) - -########################################## # Test : if a CORBA COS is built # then CORBA must be built ########################################## debian/patches/replace-svnrevision-with-date.patch0000644000000000000000000000063511761151277017534 0ustar --- a/configure.ac +++ b/configure.ac @@ -8,8 +8,8 @@ AC_CONFIG_SRCDIR(src/polyorb.ads) AC_CONFIG_AUX_DIR(support) -AM_SUBVERSION -POLYORB_VERSION="$PACKAGE_VERSION (rev. $SVNREVISION)" +RELEASE_DATE="`dpkg-parsechangelog | grep '^Version: ' | cut -d~ -f2`" +POLYORB_VERSION="$PACKAGE_VERSION (Debian release $RELEASE_DATE)" AC_SUBST(POLYORB_VERSION) AC_MSG_NOTICE([Configuring PolyORB $POLYORB_VERSION]) debian/patches/cos_naming-linkage-testsuite.patch0000644000000000000000000000106111761151277017420 0ustar --- a/testsuite/corba/cos/event/local.gpr +++ b/testsuite/corba/cos/event/local.gpr @@ -1,4 +1,4 @@ -with "polyorb", "polyorb_test_common", "polyorb_cos_event"; +with "polyorb", "polyorb_test_common", "polyorb_cos_event", "polyorb_cos_naming"; project local is --- a/testsuite/corba/cos/notification/local.gpr +++ b/testsuite/corba/cos/notification/local.gpr @@ -1,4 +1,4 @@ -with "polyorb", "polyorb_test_common", "polyorb_cos_notification"; +with "polyorb", "polyorb_test_common", "polyorb_cos_notification", "polyorb_cos_naming"; project local is debian/patches/config_dsa.patch0000644000000000000000000000365211761151277013750 0ustar --- a/compilers/gnatdist/xe_utils.adb +++ b/compilers/gnatdist/xe_utils.adb @@ -27,6 +27,7 @@ with Ada.Characters.Handling; use Ada.Characters.Handling; with Ada.Command_Line; use Ada.Command_Line; +with Ada.Strings.Fixed; use Ada.Strings.Fixed; with GNAT.Directory_Operations; use GNAT.Directory_Operations; @@ -537,10 +538,26 @@ ---------------- procedure Initialize is + Early_Configuration_Name_Id : File_Name_Type; begin XE_Names.Initialize; Set_Space_Increment (3); + -- loop move here to have configuration name to be used in all names + for J in 1 .. Argument_Count loop + Scan_Dist_Arg (Argument (J), Implicit => False); + declare + Cfg_Postfix_Position : constant Natural := + Index (Argument (J), ".cfg"); + begin + if Cfg_Postfix_Position /= 0 then + Early_Configuration_Name_Id := + Id (Argument (J) + (Argument (J)'First .. Argument (J)'Last - 4)); + end if; + end; + end loop; + Cfg_Suffix_Id := Id (Cfg_Suffix); Obj_Suffix_Id := Id (Obj_Suffix); Exe_Suffix_Id := Id (Exe_Suffix); @@ -554,7 +571,8 @@ I_Current_Dir := new String'("-I."); E_Current_Dir := new String'("-I-"); - Monolithic_App_Unit_Name := Id ("Monolithic_App"); + Monolithic_App_Unit_Name := Early_Configuration_Name_Id & "_" & + Id ("Monolithic_App"); Get_Name_String (Monolithic_App_Unit_Name); To_Lower (Name_Buffer (1 .. Name_Len)); @@ -586,10 +604,6 @@ Get_Name_String_And_Append (Stub_Dir_Name); A_Stub_Dir := new String'(Name_Buffer (1 .. Name_Len)); - for J in 1 .. Argument_Count loop - Scan_Dist_Arg (Argument (J), Implicit => False); - end loop; - if Project_File_Name_Expected then Fail ("project file name missing after -P"); end if; debian/patches/add-linker-option.patch0000644000000000000000000000445211761151277015173 0ustar --- a/projects/polyorb_common.gpr +++ b/projects/polyorb_common.gpr @@ -101,4 +101,8 @@ end Compiler; + package Linker is + for Default_Switches ("Ada") use ("-Wl,--as-needed"); + end Linker; + end PolyORB_Common; --- a/projects/polyorb_tools_po_cos_naming.gpr +++ b/projects/polyorb_tools_po_cos_naming.gpr @@ -42,6 +42,11 @@ end Compiler; + package Linker is + for Default_Switches ("Ada") + use PolyORB_Common.Linker'Default_Switches ("Ada"); + end Linker; + for Main use ("po_cos_naming.adb", "po_cos_naming_shell.adb", "ir_ab_names.adb"); end PolyORB_tools_po_cos_naming; --- a/projects/polyorb_tools_po_catref.gpr +++ b/projects/polyorb_tools_po_catref.gpr @@ -40,7 +40,10 @@ use PolyORB_Common.Compiler'Default_Switches ("Ada"); end Compiler; - + package Linker is + for Default_Switches ("Ada") + use PolyORB_Common.Linker'Default_Switches ("Ada"); + end Linker; for Main use ("po_catref.adb"); end PolyORB_tools_po_catref; --- a/projects/polyorb_tools_po_createref.gpr +++ b/projects/polyorb_tools_po_createref.gpr @@ -41,6 +41,11 @@ end Compiler; + package Linker is + for Default_Switches ("Ada") + use PolyORB_Common.Linker'Default_Switches ("Ada"); + end Linker; + for Main use ("po_createref.adb"); end PolyORB_tools_po_createref; --- a/projects/polyorb_tools_po_dumpir.gpr +++ b/projects/polyorb_tools_po_dumpir.gpr @@ -42,6 +42,11 @@ end Compiler; + package Linker is + for Default_Switches ("Ada") + use PolyORB_Common.Linker'Default_Switches ("Ada"); + end Linker; + for Main use ("po_dumpir.adb"); end PolyORB_tools_po_dumpir; --- a/projects/polyorb_tools_po_ir.gpr +++ b/projects/polyorb_tools_po_ir.gpr @@ -44,6 +44,11 @@ end Compiler; + package Linker is + for Default_Switches ("Ada") + use PolyORB_Common.Linker'Default_Switches ("Ada"); + end Linker; + for Main use ("po_ir.adb"); end PolyORB_tools_po_ir; --- a/projects/polyorb_tools_po_names.gpr +++ b/projects/polyorb_tools_po_names.gpr @@ -41,6 +41,11 @@ end Compiler; + package Linker is + for Default_Switches ("Ada") + use PolyORB_Common.Linker'Default_Switches ("Ada"); + end Linker; + for Main use ("po_names.adb"); end PolyORB_tools_po_names; debian/patches/fix-pi-get-effective-component.patch0000644000000000000000000000242411761151277017557 0ustar --- a/src/corba/portableinterceptor/portableinterceptor-clientrequestinfo-impl.adb +++ b/src/corba/portableinterceptor/portableinterceptor-clientrequestinfo-impl.adb @@ -197,12 +197,20 @@ begin while not Last (Iter) loop if Value (Iter).Tag = Component_Id (Id) then - return - (Id, - IOP.ComponentData - (CORBA.IDL_SEQUENCES.IDL_SEQUENCE_Octet.To_Sequence - (CORBA.IDL_SEQUENCES.IDL_SEQUENCE_Octet.To_Element_Array - (To_Sequence (Value (Iter).Data.all))))); + declare + package SQ renames CORBA.IDL_SEQUENCES.IDL_SEQUENCE_Octet; + + Seq_Data : constant SQ.Sequence := + To_Sequence (Value (Iter).Data.all); + begin + return + (Id, + IOP.ComponentData + (CORBA.IDL_SEQUENCES.IDL_SEQUENCE_Octet.To_Sequence + (CORBA.IDL_SEQUENCES.IDL_SEQUENCE_Octet. + To_Element_Array + (Seq_Data)))); + end; end if; Next (Iter); debian/patches/make-run_tests-target-libtype-aware.patch0000644000000000000000000000065011761151277020637 0ustar --- a/Makefile.in +++ b/Makefile.in @@ -737,7 +737,7 @@ .PHONY: run_tests run_tests: - cd testsuite && ./testsuite.py --diffs --testsuite-src-dir=${top_srcdir}/testsuite + cd STATIC/testsuite && ./testsuite.py --diffs --testsuite-src-dir=${top_srcdir}/testsuite # 'all' depends on either build-iac or build-idlac; we might as well build # both, here. We run_tests via recursive make, rather than having all-and-test debian/patches/disable-soap-random.patch0000644000000000000000000000077311761151277015476 0ustar --- a/testsuite/scenarios/examples-corba-random.conf +++ b/testsuite/scenarios/examples-corba-random.conf @@ -11,15 +11,3 @@ [server CORBA_RANDOM_0] command=../examples/corba/random/server - -[test CORBA_RANDOM_1] -id=Random test, using SOAP personality. -type=client_server - -[client CORBA_RANDOM_1] -command=../examples/corba/random/client -config_file=scenarios/polyorb_conf/soap.conf - -[server CORBA_RANDOM_1] -command=../examples/corba/random/server -config_file=scenarios/polyorb_conf/soap.conf debian/patches/polyorb-config-patch-for-gnatdist.patch0000644000000000000000000000244011761151277020273 0ustar --- a/compilers/gnatdist/xe_back-polyorb.adb +++ b/compilers/gnatdist/xe_back-polyorb.adb @@ -204,14 +204,9 @@ -- Installation information - DSA_Inc_Rel_Dir : constant String := - "include" & Dir_Separator & "polyorb"; -- PolyORB include directory, relative to the installation prefix - PolyORB_Prefix : constant String := - XE_Back.Prefix - (Check_For => DSA_Inc_Rel_Dir - & Dir_Separator & "polyorb.ads"); + PolyORB_Prefix : constant String := "/usr/"; ------------------------------- -- Generate_Ada_Starter_Code -- @@ -886,7 +881,7 @@ Prj_Fname : File_Name_Type; Prj_File : File_Descriptor; - DSA_Inc_Dir : constant String := PolyORB_Prefix & DSA_Inc_Rel_Dir; + DSA_Inc_Dir : constant String := "/usr/share/ada/adainclude/polyorb"; Secondary_PCS_Project : Name_Id; Secondary_PCS_Project_File : File_Name_Type; @@ -910,7 +905,6 @@ Write_Str ("project "); Write_Name (Secondary_PCS_Project); - Write_Str (" extends all ""polyorb"""); Write_Line (" is"); Write_Line (" for Externally_Built use ""true"";"); Write_Line (" for Source_Dirs use (""" & DSA_Inc_Dir & """);"); debian/patches/xe_defs-defaults.ads.in.patch0000644000000000000000000000135711761151277016251 0ustar Index: org.debian.polyorb/compilers/gnatdist/xe_defs-defaults.ads.in =================================================================== --- org.debian.polyorb.orig/compilers/gnatdist/xe_defs-defaults.ads.in 2008-04-24 11:49:34.823359886 +0200 +++ org.debian.polyorb/compilers/gnatdist/xe_defs-defaults.ads.in 2008-04-24 11:49:54.107496078 +0200 @@ -46,7 +46,7 @@ Default_Protocol_Data : constant String := "@DEFPROTOCOLDATA@"; Default_Protocol_Name : constant String := "@DEFPROTOCOLNAME@"; Default_Dist_Flags : constant String := "@GNAT_RTS_FLAG@"; - Default_Prefix : constant String := "@prefix@"; + Default_Prefix : constant String := "/usr"; Windows_On_Host : constant Boolean := @WINDOWS_ON_HOST@; debian/patches/cos_naming-linkage.patch0000644000000000000000000000054511761151277015377 0ustar --- a/projects/polyorb_idls_cos_naming.gpr +++ b/projects/polyorb_idls_cos_naming.gpr @@ -26,7 +26,7 @@ ------------------------------------------------------------------------------ with "polyorb_common", "polyorb_src"; -limited with "polyorb_src_corba", "polyorb_cos_naming"; +limited with "polyorb_src_corba"; project PolyORB_idls_cos_naming is debian/patches/fix-manpage-has-errors-from-man.patch0000644000000000000000000000610411761151277017640 0ustar --- a/docs/iac.1 +++ b/docs/iac.1 @@ -10,7 +10,6 @@ \fIiac\fP is an IDL-to-Ada compiler, compliant with version 1.2 of the "Ada Language Mapping Specification" produced by the OMG. .SH OPTIONS -.l \fIiac\fP accepts the following options: .TP 8 @@ -25,7 +24,7 @@ .B \-o DIR Specify output directory. .TP 8 -.B \-dm +.B \-dm Generate debug messages when analyzing scopes .TP 8 .B \-df @@ -40,13 +39,13 @@ .B \-nocpp Do not preprocess input .TP 8 -.B \- +.B \- Generate code for a supported language .TP 8 -.B types +.B types Generate a list of all types present in the IDL file .TP 8 -\&\fB \-p +\&\fB \-p Print the list generate .TP 8 .B ada @@ -70,53 +69,53 @@ \&\fB \-noir Don't generate code for interface repository (default). .TP 8 -\&\fB \-hc +\&\fB \-hc Using perfect minimal hash tables in skeletons and minimize CPU time .TP 8 -\&\fB \-hm +\&\fB \-hm Using perfect minimal hash tables in skeletons and minimize memory space .TP 8 -\&\fB \-rs +\&\fB \-rs Use the SII/SSI to handle requests .TP 8 -\&\fB \-rd +\&\fB \-rd Use the DII/DSI to handle requests (default) .TP 8 -\&\fB \-da +\&\fB \-da Dump the Ada tree .TP 8 -\&\fB \-db +\&\fB \-db Generate only the package bodies .TP 8 -\&\fB \-ds +\&\fB \-ds Generate only the package specs .TP 8 -\&\fB \-dw +\&\fB \-dw Output the withed entities .TP 8 -\&\fB \-dt +\&\fB \-dt Output tree warnings .TP 8 -\&\fB \-di +\&\fB \-di Generate code for imported entities .TP 8 .B idl Dump parsed IDL file .TP 8 -\&\fB \-b n +\&\fB \-b n Base to output integer literal As a default (zero) use base from input .TP 8 -\&\fB \-e +\&\fB \-e Expand IDL Tree .TP 8 -\&\fB \-df +\&\fB \-df Dump IDL Tree (may be used in conjunction with -e to dump the expanded IDL tree) .TP 8 -\&\fB \-di +\&\fB \-di Output IDL code of imported entities (may be used in conjunction with -e to output the expanded IDL code) @@ -141,4 +140,3 @@ The \fIPolyORB\fP WWW page, .B http://libre.adacore.com/polyorb/ -.b --- a/docs/polyorb.7 +++ b/docs/polyorb.7 @@ -34,4 +34,3 @@ The \fIPolyORB\fP WWW page, .B http://libre.adacore.com/polyorb/ -.b --- a/docs/idlac.1 +++ b/docs/idlac.1 @@ -10,7 +10,6 @@ \fIidlac\fP is an IDL-to-Ada compiler, compliant with version 1.2 of the "Ada Language Mapping Specification" produced by the OMG. .SH OPTIONS -.l \fIidlac\fP accepts the following options: .TP 8 @@ -80,4 +79,3 @@ The \fIPolyORB\fP WWW page, .B http://libre.adacore.com/polyorb/ -.b --- a/docs/polyorb-config.1 +++ b/docs/polyorb-config.1 @@ -10,7 +10,6 @@ \fIpolyorb-config\fP is a tool that is used to determine the compiler and linker flags that should be used to compile and link programs that use \fIPolyORB\fP. .SH OPTIONS -.l \fIpolyorb-config\fP accepts the following options: .TP 8 @@ -59,4 +58,3 @@ The \fIPolyORB\fP WWW page, .B http://libre.adacore.com/polyorb/ -.b --- a/docs/po_names.1 +++ b/docs/po_names.1 @@ -28,4 +28,3 @@ The \fIPolyORB\fP WWW page, .B http://libre.adacore.com/polyorb/ -.b debian/patches/hardening.patch0000644000000000000000000000355211761151277013612 0ustar --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,8 @@ # Main PolyORB Makefile +include /usr/share/dpkg/default.mk +include /usr/share/ada/debian_packaging.mk + .PHONY: default default: all @@ -84,7 +87,7 @@ # the command line if needed. Also, need to specify PARALLEL_GNATMAKE_FLAGS # before GNATMAKE_FLAGS, otherwise this variable is simply ignored. CFLAGS = @CFLAGS@ -ADAFLAGS = @ADAFLAGS@ +ADAFLAGS += @ADAFLAGS@ CPPFLAGS = @CPPFLAGS@ PARALLEL_GNATMAKE_FLAGS = -j4 EXTRA_GNATMAKE_FLAGS = @EXTRA_GNATMAKE_FLAGS@ @@ -106,7 +109,7 @@ # Extra flags for target CFLAGS_FOR_TARGET := @CFLAGS_FOR_TARGET@ ADAFLAGS_FOR_TARGET := @ADAFLAGS_FOR_TARGET@ -GNATMAKE_FLAGS_FOR_TARGET := -cargs ${ADAFLAGS_FOR_TARGET} +GNATMAKE_FLAGS_FOR_TARGET := -cargs ${ADAFLAGS_FOR_TARGET} -largs $(LDFLAGS) HAVE_ADA_DYNAMIC_PRIORITIES := @HAVE_ADA_DYNAMIC_PRIORITIES@ HAVE_SSL := @HAVE_SSL@ @@ -235,11 +238,11 @@ : build-%: mkdir -p compilers/${compiler_dir} && \ cd compilers/${compiler_dir} && \ - ${GNATMAKE} -m \ + ${GNATMAKE} $(ADAFLAGS) -m \ $*.adb \ ${COMP_TOOLS_GNATMAKE_FLAGS} \ -I${top_srcdir}/compilers/${compiler_dir} \ - ${PRJ_GNATMAKE_FLAGS} -bargs -E + ${PRJ_GNATMAKE_FLAGS} -bargs -E -largs $(LDFLAGS) # Binder switch -E causes traceback information to be included in # Exception_Occurrences. @@ -247,7 +250,7 @@ mkdir -p compilers/${compiler_dir} && \ cd compilers/${compiler_dir} && \ ADA_PROJECT_PATH="${top_builddir}/projects${PATH_SEP}${top_srcdir}/projects${PATH_SEP}$$ADA_PROJECT_PATH" \ - ${GNATMAKE} -p -m -P compilers_gnatdist + ${GNATMAKE} -p $(ADAFLAGS) -m -P compilers_gnatdist -largs $(LDFLAGS) # The following variables are used for invoking idlac. There is a static # pattern rule for each; see "Rules for running idlac", below. Each file debian/patches/NF_27_IC22_022.patch0000644000000000000000000001154411761151277013570 0ustar Backporter: Xavier Grave This patch enables -gnaty to be passed as an po_gnatdist option NF-27-IC22-022 is the Ada Core Polyorb reference about this change (see also 154614 revision of the official polyorb subversion server) --- a/compilers/gnatdist/xe_back-garlic.adb +++ b/compilers/gnatdist/xe_back-garlic.adb @@ -278,7 +278,7 @@ Filename := Dir (Current.Partition_Dir, Filename); Create_File (File, Filename); Set_Output (File); - Write_Line ("pragma Warnings (Off);"); + Write_Warnings_Pragmas; Write_With_Clause (RU (RU_System_Garlic_Filters), True); Write_With_Clause (RU (RU_System_Garlic_Heart), True); @@ -649,7 +649,7 @@ Filename := Dir (Current.Partition_Dir, Filename); Create_File (File, Filename); Set_Output (File); - Write_Line ("pragma Warnings (Off);"); + Write_Warnings_Pragmas; Write_With_Clause (RU (RU_System_Partition_Interface), True); Write_With_Clause (RU (RU_System_RPC)); @@ -894,7 +894,7 @@ Create_File (File, Filename); Set_Output (File); - Write_Line ("pragma Warnings (Off);"); + Write_Warnings_Pragmas; -- Required location protocols @@ -1002,7 +1002,7 @@ Create_File (File, Filename); Set_Output (File); - Write_Line ("pragma Warnings (Off);"); + Write_Warnings_Pragmas; end if; end Setup_Output; --- a/compilers/gnatdist/xe_back-polyorb.adb +++ b/compilers/gnatdist/xe_back-polyorb.adb @@ -259,7 +259,7 @@ Create_File (File, Filename); Set_Output (File); - Write_Line ("pragma Warnings (Off);"); + Write_Warnings_Pragmas; -- First drag platform the specific base setup @@ -722,7 +722,7 @@ Filename := Dir (Current.Partition_Dir, Filename); Create_File (File, Filename); Set_Output (File); - Write_Line ("pragma Warnings (Off);"); + Write_Warnings_Pragmas; -- Import the storage supports used by this partition @@ -806,7 +806,7 @@ Filename := Dir (Current.Partition_Dir, Filename); Create_File (File, Filename); Set_Output (File); - Write_Line ("pragma Warnings (Off);"); + Write_Warnings_Pragmas; Write_With_Clause (RU (RU_PolyORB_ORB)); Write_With_Clause (RU (RU_PolyORB_Initialization)); --- a/compilers/gnatdist/xe_list.adb +++ b/compilers/gnatdist/xe_list.adb @@ -36,7 +36,6 @@ with XE_Names; use XE_Names; with XE_Units; use XE_Units; with XE_Utils; use XE_Utils; -pragma Elaborate_All (XE_Utils); package body XE_List is @@ -534,7 +533,7 @@ Register_Temp_File (Monolithic_Src_File, Monolithic_Src_Name); Set_Output (Monolithic_Src_File); - Write_Line ("pragma Warnings (Off);"); + Write_Warnings_Pragmas; -- Record the associated object and ALI files as temporary files to -- be cleaned up eventually. --- a/compilers/gnatdist/xe_parse.adb +++ b/compilers/gnatdist/xe_parse.adb @@ -264,7 +264,7 @@ Parameter_Sloc : XE_Scan.Location_Type) is Ignore : Parameter_Id; - pragma Warnings (Off, Ignore); + pragma Unreferenced (Ignore); begin Declare_Subprogram_Parameter (Parameter_Name, Para_Type_Node, Subprogram_Node, Parameter_Sloc, @@ -345,7 +345,7 @@ Attribute_Sloc : Location_Type) is Ignore : Attribute_Id; - pragma Warnings (Off, Ignore); + pragma Unreferenced (Ignore); begin Declare_Type_Attribute (Type_Node, Attribute_Name, Attr_Type_Node, Attribute_Kind, @@ -385,7 +385,7 @@ Component_Sloc : Location_Type) is Ignore : Component_Id; - pragma Warnings (Off, Ignore); + pragma Unreferenced (Ignore); begin Declare_Type_Component (Type_Node, Component_Name, Comp_Type_Node, Component_Sloc, --- a/compilers/gnatdist/xe_utils.adb +++ b/compilers/gnatdist/xe_utils.adb @@ -1138,4 +1138,20 @@ Message ("file", Fname, "does not exist"); end Write_Missing_File; + ---------------------------- + -- Write_Warnings_Pragmas -- + ---------------------------- + + procedure Write_Warnings_Pragmas is + begin + -- Turn off warnings + + Write_Line ("pragma Warnings (Off);"); + + -- Turn off style checks and set maximum line length to the largest + -- supported value. + + Write_Line ("pragma Style_Checks (""NM32766"");"); + end Write_Warnings_Pragmas; + end XE_Utils; --- a/compilers/gnatdist/xe_utils.ads +++ b/compilers/gnatdist/xe_utils.ads @@ -174,6 +174,9 @@ procedure Write_Missing_File (Fname : File_Name_Type); -- Output an informational message to indicate that Fname is missing + procedure Write_Warnings_Pragmas; + -- Generate pragmas to turn off warnings and style checks + ----------------------- -- Command Handling -- ----------------------- debian/patches/testsuite-enhancement.patch0000644000000000000000000000241711761151277016166 0ustar --- a/testsuite/testsuite.py +++ b/testsuite/testsuite.py @@ -36,7 +36,7 @@ """Run the testsuite and generate reports""" # Parse the command lines options m = Main(add_targets_options=True) - add_mainloop_options(m) + add_mainloop_options(m, True) add_run_test_options(m) m.add_option('--diffs', dest='diffs', action='store_true', default=False, help='show diffs on stdout') --- a/testsuite/tests/run-test.py +++ b/testsuite/tests/run-test.py @@ -35,6 +35,7 @@ Failed if test_utils.fail() has been called ("TEST FAILED" written) """ if str_list and 'TEST FAILED' in str_list: + os.system ("touch test_failed") return str_list if 'server PASSED' in str_list or 'local PASSED' in str_list: # Test ok --- a/Makefile.in +++ b/Makefile.in @@ -757,7 +757,8 @@ .PHONY: run_tests run_tests: - cd testsuite && ./testsuite.py --diffs --testsuite-src-dir=${top_srcdir}/testsuite + cd testsuite && ./testsuite.py --abort-file=test_failed --diffs --testsuite-src-dir=${top_srcdir}/testsuite + [ ! -e testsuite/test_failed ] # 'all' depends on either build-iac or build-idlac; we might as well build # both, here. We run_tests via recursive make, rather than having all-and-test debian/patches/remove-rtcorba.patch0000644000000000000000000002634611761151277014610 0ustar --- a/Makefile.in +++ b/Makefile.in @@ -259,7 +259,6 @@ misc_corba_dynamicany_idl_stamps := misc_corba_messaging_idl_stamps := misc_corba_portableinterceptor_idl_stamps := -rtcorba_corba_rtcorba_idl_stamps := self_idl_stamps := all_idl_stamps = \ ${idls_idl_stamps} \ @@ -270,7 +269,6 @@ ${misc_corba_dynamicany_idl_stamps} \ ${misc_corba_messaging_idl_stamps} \ ${misc_corba_portableinterceptor_idl_stamps} \ - ${rtcorba_corba_rtcorba_idl_stamps} \ ${self_idl_stamps} idlac_include_dirs := \ @@ -365,8 +363,6 @@ src/corba/portableinterceptor/PortableInterceptor.idl-stamp: idlac_flags := misc_corba_portableinterceptor_idl_stamps += src/corba/portableinterceptor/Dynamic.idl-stamp src/corba/portableinterceptor/Dynamic.idl-stamp: idlac_flags := -rtcorba_corba_rtcorba_idl_stamps += src/corba/rtcorba/RTCosScheduling.idl-stamp -src/corba/rtcorba/RTCosScheduling.idl-stamp: idlac_flags := interop_corba_security_idl_stamps += src/corba/security/CSI.idl-stamp src/corba/security/CSI.idl-stamp: idlac_flags := -c @@ -478,8 +474,6 @@ libpolyorb-corba-messaging.a: polyorb_src_corba_messaging.gpr .PHONY: libpolyorb-corba-portableinterceptor.a libpolyorb-corba-portableinterceptor.a: polyorb_src_corba_portableinterceptor.gpr -.PHONY: libpolyorb-corba-rtcorba.a -libpolyorb-corba-rtcorba.a: polyorb_src_corba_rtcorba.gpr .PHONY: libpolyorb-corba-security.a libpolyorb-corba-security.a: polyorb_src_corba_security.gpr .PHONY: libpolyorb-corba-security-gssup.a @@ -537,7 +531,7 @@ # Additional dependencies: polyorb_src.gpr: src/csupport.o -polyorb_src_corba.gpr: polyorb_src_corba_dynamicany.gpr polyorb_src_corba_iop.gpr polyorb_src_corba_messaging.gpr polyorb_src_corba_portableinterceptor.gpr polyorb_src_corba_rtcorba.gpr +polyorb_src_corba.gpr: polyorb_src_corba_dynamicany.gpr polyorb_src_corba_iop.gpr polyorb_src_corba_messaging.gpr polyorb_src_corba_portableinterceptor.gpr ifeq (${HAVE_SSL},yes) polyorb_src_giop_iiop.gpr: polyorb_src_giop_iiop_security.gpr polyorb_src_giop_iiop_security_tls.gpr @@ -785,12 +779,6 @@ cd ${dir $@} && ${idlac} ${idlac_flags} $< touch $@ -${rtcorba_corba_rtcorba_idl_stamps}: src/corba/rtcorba/%.idl-stamp: ${top_srcdir}/idls/RTCORBA/%.idl - mkdir -p ${dir $@} - cd ${dir $@} && ${idlac} ${idlac_flags} $< - touch $@ - - ${self_idl_stamps}: %.idl-stamp: ${top_srcdir}/%.idl mkdir -p ${dir $@} cd ${dir $@} && ${idlac} ${idlac_flags} $< @@ -1186,18 +1174,6 @@ src/corba/portableinterceptor/dynamic.ads \ src/corba/portableinterceptor/dynamic-helper.adb \ src/corba/portableinterceptor/dynamic-helper.ads \ - src/corba/rtcorba/rtcosscheduling.adb \ - src/corba/rtcorba/rtcosscheduling.ads \ - src/corba/rtcorba/rtcosscheduling-clientscheduler.adb \ - src/corba/rtcorba/rtcosscheduling-clientscheduler.ads \ - src/corba/rtcorba/rtcosscheduling-clientscheduler-helper.adb \ - src/corba/rtcorba/rtcosscheduling-clientscheduler-helper.ads \ - src/corba/rtcorba/rtcosscheduling-helper.adb \ - src/corba/rtcorba/rtcosscheduling-helper.ads \ - src/corba/rtcorba/rtcosscheduling-serverscheduler.adb \ - src/corba/rtcorba/rtcosscheduling-serverscheduler.ads \ - src/corba/rtcorba/rtcosscheduling-serverscheduler-helper.adb \ - src/corba/rtcorba/rtcosscheduling-serverscheduler-helper.ads \ idls/cos/event/coseventchanneladmin.adb \ idls/cos/event/coseventchanneladmin.ads \ idls/cos/event/coseventchanneladmin-consumeradmin.adb \ @@ -1520,51 +1496,6 @@ examples/corba/all_types/all_types-ir_info.ads \ examples/corba/all_types/all_types-skel.adb \ examples/corba/all_types/all_types-skel.ads \ - examples/corba/rtcorba/rtcosscheduling/echo.adb \ - examples/corba/rtcorba/rtcosscheduling/echo.ads \ - examples/corba/rtcorba/rtcosscheduling/echo-helper.adb \ - examples/corba/rtcorba/rtcosscheduling/echo-helper.ads \ - examples/corba/rtcorba/rtcosscheduling/echo-skel.adb \ - examples/corba/rtcorba/rtcosscheduling/echo-skel.ads \ - examples/corba/rtcorba/client_propagated/echo.adb \ - examples/corba/rtcorba/client_propagated/echo.ads \ - examples/corba/rtcorba/client_propagated/echo-helper.adb \ - examples/corba/rtcorba/client_propagated/echo-helper.ads \ - examples/corba/rtcorba/client_propagated/echo-skel.adb \ - examples/corba/rtcorba/client_propagated/echo-skel.ads \ - examples/corba/rtcorba/server_declared/echo.adb \ - examples/corba/rtcorba/server_declared/echo.ads \ - examples/corba/rtcorba/server_declared/echo-helper.adb \ - examples/corba/rtcorba/server_declared/echo-helper.ads \ - examples/corba/rtcorba/server_declared/echo-skel.adb \ - examples/corba/rtcorba/server_declared/echo-skel.ads \ - examples/corba/rtcorba/dhb/dhb.ads \ - examples/corba/rtcorba/dhb/dhb-background_worker.adb \ - examples/corba/rtcorba/dhb/dhb-background_worker.ads \ - examples/corba/rtcorba/dhb/dhb-background_worker_factory.adb \ - examples/corba/rtcorba/dhb/dhb-background_worker_factory.ads \ - examples/corba/rtcorba/dhb/dhb-background_worker_factory-helper.adb \ - examples/corba/rtcorba/dhb/dhb-background_worker_factory-helper.ads \ - examples/corba/rtcorba/dhb/dhb-background_worker_factory-skel.adb \ - examples/corba/rtcorba/dhb/dhb-background_worker_factory-skel.ads \ - examples/corba/rtcorba/dhb/dhb-background_worker-helper.adb \ - examples/corba/rtcorba/dhb/dhb-background_worker-helper.ads \ - examples/corba/rtcorba/dhb/dhb-background_worker-skel.adb \ - examples/corba/rtcorba/dhb/dhb-background_worker-skel.ads \ - examples/corba/rtcorba/dhb/dhb-helper.adb \ - examples/corba/rtcorba/dhb/dhb-helper.ads \ - examples/corba/rtcorba/dhb/dhb-worker.adb \ - examples/corba/rtcorba/dhb/dhb-worker.ads \ - examples/corba/rtcorba/dhb/dhb-worker_factory.adb \ - examples/corba/rtcorba/dhb/dhb-worker_factory.ads \ - examples/corba/rtcorba/dhb/dhb-worker_factory-helper.adb \ - examples/corba/rtcorba/dhb/dhb-worker_factory-helper.ads \ - examples/corba/rtcorba/dhb/dhb-worker_factory-skel.adb \ - examples/corba/rtcorba/dhb/dhb-worker_factory-skel.ads \ - examples/corba/rtcorba/dhb/dhb-worker-helper.adb \ - examples/corba/rtcorba/dhb/dhb-worker-helper.ads \ - examples/corba/rtcorba/dhb/dhb-worker-skel.adb \ - examples/corba/rtcorba/dhb/dhb-worker-skel.ads \ examples/corba/echo/echo.adb \ examples/corba/echo/echo.ads \ examples/corba/echo/echo-delegate.adb \ @@ -1698,18 +1629,6 @@ src/corba/portableinterceptor/dynamic.ads \ src/corba/portableinterceptor/dynamic-helper.adb \ src/corba/portableinterceptor/dynamic-helper.ads \ - src/corba/rtcorba/rtcosscheduling.adb \ - src/corba/rtcorba/rtcosscheduling.ads \ - src/corba/rtcorba/rtcosscheduling-clientscheduler.adb \ - src/corba/rtcorba/rtcosscheduling-clientscheduler.ads \ - src/corba/rtcorba/rtcosscheduling-clientscheduler-helper.adb \ - src/corba/rtcorba/rtcosscheduling-clientscheduler-helper.ads \ - src/corba/rtcorba/rtcosscheduling-helper.adb \ - src/corba/rtcorba/rtcosscheduling-helper.ads \ - src/corba/rtcorba/rtcosscheduling-serverscheduler.adb \ - src/corba/rtcorba/rtcosscheduling-serverscheduler.ads \ - src/corba/rtcorba/rtcosscheduling-serverscheduler-helper.adb \ - src/corba/rtcorba/rtcosscheduling-serverscheduler-helper.ads \ src/corba/security/csi.ads \ src/corba/security/csi-helper.adb \ src/corba/security/csi-helper.ads \ --- a/projects/polyorb_src_corba_rtcorba.gpr +++ /dev/null @@ -1,51 +0,0 @@ ------------------------------------------------------------------------------- --- -- --- POLYORB COMPONENTS -- --- -- --- P O L Y O R B _ S R C _ C O R B A _ R T C O R B A -- --- -- --- P r o j -- --- -- --- Copyright (C) 2007-2009, Free Software Foundation, Inc. -- --- -- --- PolyORB is free software; you can redistribute it and/or modify it -- --- under terms of the GNU General Public License as published by the Free -- --- Software Foundation; either version 2, or (at your option) any later -- --- version. PolyORB is distributed in the hope that it will be useful, -- --- but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- -- --- TABILITY 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 distributed with PolyORB; see file COPYING. If -- --- not, write to the Free Software Foundation, 51 Franklin Street, Fifth -- --- Floor, Boston, MA 02111-1301, USA. -- --- -- --- -- --- PolyORB is maintained by AdaCore -- --- (email: sales@adacore.com) -- --- -- ------------------------------------------------------------------------------- - -with "polyorb_common", "polyorb_src", "polyorb_src_corba", "polyorb_src_corba_iop"; - -project PolyORB_src_corba_rtcorba is - - Dir := "src/corba/rtcorba"; - Obj_Dir := PolyORB_Common.Build_Dir & Dir; - for Object_Dir use Obj_Dir; - for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - - Libname := "polyorb-corba-rtcorba"; - for Library_Name use Libname; - for Library_Dir use PolyORB_Common.Build_Dir & "lib"; - for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_corba_rtcorba"; - for Library_Kind use PolyORB_Common.Libtype; - for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; - - package Compiler is - - for Default_Switches ("Ada") - use PolyORB_Src.Compiler'Default_Switches ("Ada"); - - end Compiler; - -end PolyORB_src_corba_rtcorba; --- a/Makefile.common.project.in +++ b/Makefile.common.project.in @@ -7,8 +7,7 @@ aws_lib=-I$(top_builddir)/src/aws/libpolyorb-aws.la -corba_lib=$(top_builddir)/src/corba/libpolyorb-corba.la \ - $(top_builddir)/src/corba/rtcorba/libpolyorb-corba-rtcorba.la +corba_lib=$(top_builddir)/src/corba/libpolyorb-corba.la moma_lib=$(top_builddir)/src/moma/libpolyorb-moma.la @@ -33,8 +32,7 @@ aws_lib=libpolyorb-aws.a -corba_lib=libpolyorb-corba.a \ - libpolyorb-corba-rtcorba.a +corba_lib=libpolyorb-corba.a moma_lib=libpolyorb-moma.a @@ -93,8 +91,7 @@ -I$(top_srcdir)/src/corba/messaging \ -I$(top_builddir)/src/corba/messaging \ -I$(top_srcdir)/src/corba/portableinterceptor \ - -I$(top_builddir)/src/corba/portableinterceptor \ - -I$(top_srcdir)/src/corba/rtcorba -I$(top_builddir)/src/corba/rtcorba + -I$(top_builddir)/src/corba/portableinterceptor moma_inc=-I$(top_srcdir)/src/moma -I$(top_builddir)/src/moma debian/patches/tests-static-adaptation.patch0000644000000000000000000000054311761151277016421 0ustar --- a/testsuite/tests/cos/naming/NAMING_0/test.py +++ b/testsuite/tests/cos/naming/NAMING_0/test.py @@ -3,6 +3,6 @@ import sys if not client_server(r'corba/cos/naming/test_naming_corba', r'', - r'../tools/po_cos_naming/po_cos_naming', r''): + r'../STATIC/tools/po_cos_naming/po_cos_naming', r''): fail() debian/patches/add-version-to-libraries.patch0000644000000000000000000006246211761151277016465 0ustar --- a/projects/polyorb_common.gpr +++ b/projects/polyorb_common.gpr @@ -37,6 +37,8 @@ Libtype : Lib_Type := external ("Libtype", "STATIC"); + Libversion := external ("Libversion", "3"); + Warnings_Mode := external ("Warnings_Mode", "e"); -- Possible values: -- e: treat warnings as errors, default --- a/projects/polyorb_cos_event.gpr +++ b/projects/polyorb_cos_event.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-corba-cos-event-impl"; + Libname := "polyorb-corba-cos-event-impl"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/cos_event"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_cos_ir.gpr +++ b/projects/polyorb_cos_ir.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-corba-cos-ir-impl"; + Libname := "polyorb-corba-cos-ir-impl"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/cos_ir"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_cos_naming.gpr +++ b/projects/polyorb_cos_naming.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-corba-cos-naming-impl"; + Libname := "polyorb-corba-cos-naming-impl"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/cos_naming"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_cos_notification.gpr +++ b/projects/polyorb_cos_notification.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-corba-cos-notification-impl"; + Libname := "polyorb-corba-cos-notification-impl"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/cos_notification"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_cos_time.gpr +++ b/projects/polyorb_cos_time.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-corba-cos-time-impl"; + Libname := "polyorb-corba-cos-time-impl"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/cos_time"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_idls_cos_event.gpr +++ b/projects/polyorb_idls_cos_event.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-corba-cos-event"; + Libname := "polyorb-corba-cos-event"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/idls_cos_event"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_idls_cos_naming.gpr +++ b/projects/polyorb_idls_cos_naming.gpr @@ -35,10 +35,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-corba-cos-naming"; + Libname := "polyorb-corba-cos-naming"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/idls_cos_naming"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_idls_cos_notification.gpr +++ b/projects/polyorb_idls_cos_notification.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-corba-cos-notification"; + Libname := "polyorb-corba-cos-notification"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/idls_cos_notification"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_idls_cos_time.gpr +++ b/projects/polyorb_idls_cos_time.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-corba-cos-time"; + Libname := "polyorb-corba-cos-time"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/idls_cos_time"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src.gpr +++ b/projects/polyorb_src.gpr @@ -37,10 +37,12 @@ for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); for Excluded_Source_List_File use Obj_Dir & "/src.exclude"; - for Library_Name use "polyorb"; + Libname := "polyorb"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_corba.gpr +++ b/projects/polyorb_src_corba.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-corba"; + Libname := "polyorb-corba"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_corba"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_corba_dynamicany.gpr +++ b/projects/polyorb_src_corba_dynamicany.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-corba-dynamicany"; + Libname := "polyorb-corba-dynamicany"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_corba_dynamicany"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_corba_iop.gpr +++ b/projects/polyorb_src_corba_iop.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-corba-iop"; + Libname := "polyorb-corba-iop"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_corba_iop"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_corba_messaging.gpr +++ b/projects/polyorb_src_corba_messaging.gpr @@ -38,10 +38,12 @@ -- Only generated sources, no sources from repository, but Obj_Dir now -- points to STATIC and DYNAMIC dirs... - for Library_Name use "polyorb-corba-messaging"; + Libname := "polyorb-corba-messaging"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_corba_messaging"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_corba_portableinterceptor.gpr +++ b/projects/polyorb_src_corba_portableinterceptor.gpr @@ -38,10 +38,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-corba-portableinterceptor"; + Libname := "polyorb-corba-portableinterceptor"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_corba_portableinterceptor"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_corba_rtcorba.gpr +++ b/projects/polyorb_src_corba_rtcorba.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-corba-rtcorba"; + Libname := "polyorb-corba-rtcorba"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_corba_rtcorba"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_corba_security.gpr +++ b/projects/polyorb_src_corba_security.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-corba-security"; + Libname := "polyorb-corba-security"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_corba_security"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_corba_security_gssup.gpr +++ b/projects/polyorb_src_corba_security_gssup.gpr @@ -37,10 +37,12 @@ -- for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); -- Only generated sources, no sources from repository - for Library_Name use "polyorb-corba-security-gssup"; + Libname := "polyorb-corba-security-gssup"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_corba_security_gssup"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_dsa.gpr +++ b/projects/polyorb_src_dsa.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-dsa"; + Libname := "polyorb-dsa"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_dsa"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_giop.gpr +++ b/projects/polyorb_src_giop.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-giop"; + Libname := "polyorb-giop"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_giop"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_giop_diop.gpr +++ b/projects/polyorb_src_giop_diop.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-giop-diop"; + Libname := "polyorb-giop-diop"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_giop_diop"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_giop_iiop.gpr +++ b/projects/polyorb_src_giop_iiop.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-giop-iiop"; + Libname := "polyorb-giop-iiop"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_giop_iiop"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_giop_iiop_security.gpr +++ b/projects/polyorb_src_giop_iiop_security.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-giop-iiop-security"; + Libname := "polyorb-giop-iiop-security"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_giop_iiop_security"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_giop_iiop_security_tls.gpr +++ b/projects/polyorb_src_giop_iiop_security_tls.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-giop-iiop-security-tls"; + Libname := "polyorb-giop-iiop-security-tls"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_giop_iiop_security_tls"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_giop_iiop_ssliop.gpr +++ b/projects/polyorb_src_giop_iiop_ssliop.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-giop-iiop-ssliop"; + Libname := "polyorb-giop-iiop-ssliop"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_giop_iiop_ssliop"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_giop_miop.gpr +++ b/projects/polyorb_src_giop_miop.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-giop-miop"; + Libname := "polyorb-giop-miop"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_giop_miop"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_moma.gpr +++ b/projects/polyorb_src_moma.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-moma"; + Libname := "polyorb-moma"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_moma"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_security.gpr +++ b/projects/polyorb_src_security.gpr @@ -36,10 +36,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-security"; + Libname := "polyorb-security"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_security"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_security_gssup.gpr +++ b/projects/polyorb_src_security_gssup.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-security-gssup"; + Libname := "polyorb-security-gssup"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_security_gssup"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_security_tls.gpr +++ b/projects/polyorb_src_security_tls.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-security-tls"; + Libname := "polyorb-security-tls"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_security_tls"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_security_x509.gpr +++ b/projects/polyorb_src_security_x509.gpr @@ -36,10 +36,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-security-x509"; + Libname := "polyorb-security-x509"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_security_x509"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_setup_security.gpr +++ b/projects/polyorb_src_setup_security.gpr @@ -38,10 +38,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-setup-security"; + Libname := "polyorb-setup-security"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_setup_security"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_soap.gpr +++ b/projects/polyorb_src_soap.gpr @@ -36,10 +36,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-soap"; + Libname := "polyorb-soap"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_soap"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_srp.gpr +++ b/projects/polyorb_src_srp.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-srp"; + Libname := "polyorb-srp"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_srp"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_ssl.gpr +++ b/projects/polyorb_src_ssl.gpr @@ -36,10 +36,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-ssl"; + Libname := "polyorb-ssl"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_ssl"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_web_common.gpr +++ b/projects/polyorb_src_web_common.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-web_common"; + Libname := "polyorb-web_common"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_web_common"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_setup.gpr.in +++ b/projects/polyorb_src_setup.gpr.in @@ -45,10 +45,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-setup"; + Libname := "polyorb-setup"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_setup"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_aws.gpr +++ b/projects/polyorb_src_aws.gpr @@ -35,10 +35,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir, PolyORB_Common.Source_Dir & "src/aws_orig"); - for Library_Name use "polyorb-aws"; + Libname := "polyorb-aws"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_aws"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_dns.gpr +++ b/projects/polyorb_src_dns.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-dns"; + Libname := "polyorb-dns"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_dns"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_dns_mdns.gpr +++ b/projects/polyorb_src_dns_mdns.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-dns-mdns"; + Libname := "polyorb-dns-mdns"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_dns_mdns"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is --- a/projects/polyorb_src_dns_udns.gpr +++ b/projects/polyorb_src_dns_udns.gpr @@ -34,10 +34,12 @@ for Object_Dir use Obj_Dir; for Source_Dirs use (Obj_Dir, PolyORB_Common.Source_Dir & Dir); - for Library_Name use "polyorb-dns-udns"; + Libname := "polyorb-dns-udns"; + for Library_Name use Libname; for Library_Dir use PolyORB_Common.Build_Dir & "lib"; for Library_ALI_Dir use PolyORB_Common.Build_Dir & "ali/src_dns_udns"; for Library_Kind use PolyORB_Common.Libtype; + for Library_Version use "lib" & Libname & ".so." & PolyORB_Common.Libversion; package Compiler is debian/patches/bug-562192.patch0000644000000000000000000000130611761151277013171 0ustar Index: org.debian.polyorb/projects/common.gpr =================================================================== --- org.debian.polyorb.orig/projects/common.gpr 2010-01-26 12:32:48.028453499 +0100 +++ org.debian.polyorb/projects/common.gpr 2010-01-26 12:33:19.787803300 +0100 @@ -92,8 +92,8 @@ for Default_Switches ("Ada") use Base_Ada_Compiler_Switches & ("-gnato", -- Overflow checks - "-gnata", -- Enable assertions - "-fstack-check"); -- Stack overflow checking + "-gnata"); -- Enable assertions + -- "-fstack-check"); Stack overflow checking end case; debian/patches/bug-561121.patch0000644000000000000000000000321511761151277013161 0ustar --- a/Makefile.in +++ b/Makefile.in @@ -221,8 +221,6 @@ build-mknodes \ build-iac \ \ -build-po_gnatdist \ -\ : build-%: mkdir -p compilers/${compiler_dir} && \ cd compilers/${compiler_dir} && \ @@ -234,6 +232,12 @@ # Binder switch -E causes traceback information to be included in # Exception_Occurrences. +build-po_gnatdist: + mkdir -p compilers/${compiler_dir} && \ + cd compilers/${compiler_dir} && \ + ADA_PROJECT_PATH="${top_builddir}/projects${PATH_SEP}${top_srcdir}/projects${PATH_SEP}$$ADA_PROJECT_PATH" \ + ${GNATMAKE} -p -m -P compilers_gnatdist + # The following variables are used for invoking idlac. There is a static # pattern rule for each; see "Rules for running idlac", below. Each file # mumble.idl has a corresponding empty mumble.idl-stamp file, which is --- /dev/null +++ b/projects/compilers_gnatdist.gpr @@ -0,0 +1,27 @@ +with "polyorb_common", "polyorb_config"; + +project compilers_gnatdist is + + Dir := "compilers/gnatdist"; + for Object_Dir use PolyORB_Common.Source_Dir & Dir; + for Source_Dirs use (PolyORB_Common.Source_Dir & Dir); + for Main use ("po_gnatdist.adb"); + + package Compiler is + for Default_Switches ("Ada") use + ("-gnat05", + PolyORB_Config.Style_Switch, + "-gnatwe", + "-g", + "-O2", + "-gnatec=" & PolyORB_Config.Top_Build_Dir & "/compilers/config.adc"); + for Switches ("xe.adb") use + ("-gnat05", + PolyORB_Config.Style_Switch, + "-gnatwe", + "-g", + "-O1", + "-gnatec=" & PolyORB_Config.Top_Build_Dir & "/compilers/config.adc"); + end Compiler; + +end compilers_gnatdist; debian/patches/testsuite-combined-output.patch0000644000000000000000000001466111761151277017023 0ustar --- a/testsuite/utils/test_driver.adb +++ b/testsuite/utils/test_driver.adb @@ -36,6 +36,7 @@ with Test_Suite.Scenarios; with Test_Suite.Output.File; with Test_Suite.Output.Text; +with Test_Suite.Output.Combined; with PolyORB.Initialization; @@ -53,6 +54,7 @@ use Test_Suite.Output; use Test_Suite.Output.File; use Test_Suite.Output.Text; + use Test_Suite.Output.Combined; procedure Run; -- Run test driver @@ -151,6 +153,9 @@ elsif Parameter = "file" then Output := new File_Output; + elsif Parameter = "combined" then + Output := new Combined_Output; + else Put_Line (Standard_Error, "Invalid output: " & Parameter); raise Constraint_Error; --- /dev/null +++ b/testsuite/utils/test_suite-output-combined.adb @@ -0,0 +1,123 @@ +with Test_Suite.Output.Text; +with Test_Suite.Output.File; + +package body Test_Suite.Output.Combined is + + use Test_Suite.Output.File; + use Test_Suite.Output.Text; + + Text : Text_Output; + File : File_Output; + + ------------------------------------------------------------------------- + + procedure Open (Output : Combined_Output) is + pragma Unreferenced (Output); + begin + Text.Open; + File.Open; + end Open; + + ------------------------------------------------------------------------- + + procedure Close (Output : Combined_Output) is + pragma Unreferenced (Output); + begin + Text.Close; + File.Close; + end Close; + + ------------------------------------------------------------------------- + + procedure Error + (Output : Combined_Output; + Error_Msg : String) + is + pragma Unreferenced (Output); + begin + Text.Error (Error_Msg); + File.Error (Error_Msg); + end Error; + + ------------------------------------------------------------------------- + + procedure Log + (Output : Combined_Output; + Log_Msg : String) + is + pragma Unreferenced (Output); + begin + Text.Log (Log_Msg); + File.Log (Log_Msg); + end Log; + + ------------------------------------------------------------------------- + + procedure Separator (Output : Combined_Output) is + pragma Unreferenced (Output); + begin + Text.Separator; + File.Separator; + end Separator; + + ------------------------------------------------------------------------- + + procedure Open_Test_Output_Context + (Output : Combined_Output; + Name : String) + is + pragma Unreferenced (Output); + begin + Text.Open_Test_Output_Context (Name); + File.Open_Test_Output_Context (Name); + end Open_Test_Output_Context; + + ------------------------------------------------------------------------- + + procedure Close_Test_Output_Context + (Output : Combined_Output; + Result : Boolean) + is + pragma Unreferenced (Output); + begin + Text.Close_Test_Output_Context (Result); + File.Close_Test_Output_Context (Result); + end Close_Test_Output_Context; + + ------------------------------------------------------------------------- + + procedure Open_Scenario_Output_Context + (Output : Combined_Output; + Name : String) + is + pragma Unreferenced (Output); + begin + Text.Open_Scenario_Output_Context (Name); + File.Open_Scenario_Output_Context (Name); + end Open_Scenario_Output_Context; + + ------------------------------------------------------------------------- + + procedure Close_Scenario_Output_Context + (Output : Combined_Output; + Result : Boolean) + is + pragma Unreferenced (Output); + begin + Text.Close_Scenario_Output_Context (Result); + File.Close_Scenario_Output_Context (Result); + end Close_Scenario_Output_Context; + + ------------------------------------------------------------------------- + + procedure Test_Execution + (Output : Combined_Output; + Msg : String) + is + pragma Unreferenced (Output); + begin + Text.Test_Execution (Msg); + File.Test_Execution (Msg); + end Test_Execution; + +end Test_Suite.Output.Combined; --- /dev/null +++ b/testsuite/utils/test_suite-output-combined.ads @@ -0,0 +1,45 @@ +-- Output implementation producing messages on standard output and file + +package Test_Suite.Output.Combined is + + type Combined_Output is new Test_Suite_Output with private; + + procedure Open (Output : Combined_Output); + + procedure Close (Output : Combined_Output); + + procedure Error + (Output : Combined_Output; + Error_Msg : String); + + procedure Log + (Output : Combined_Output; + Log_Msg : String); + + procedure Test_Execution + (Output : Combined_Output; + Msg : String); + + procedure Separator (Output : Combined_Output); + + procedure Open_Test_Output_Context + (Output : Combined_Output; + Name : String); + + procedure Close_Test_Output_Context + (Output : Combined_Output; + Result : Boolean); + + procedure Open_Scenario_Output_Context + (Output : Combined_Output; + Name : String); + + procedure Close_Scenario_Output_Context + (Output : Combined_Output; + Result : Boolean); + +private + + type Combined_Output is new Test_Suite_Output with null record; + +end Test_Suite.Output.Combined; --- a/Makefile.in +++ b/Makefile.in @@ -730,7 +730,7 @@ .PHONY: run_tests run_tests: - cd STATIC/testsuite && ./utils/test_driver -full ${top_srcdir}/testsuite/scenarios -output file -config ${top_srcdir}/testsuite -verbose + cd STATIC/testsuite && ./utils/test_driver -full ${top_srcdir}/testsuite/scenarios -output combined -config ${top_srcdir}/testsuite -verbose # 'all' depends on either build-iac or build-idlac; we might as well build # both, here. We run_tests via recursive make, rather than having all-and-test --- a/testsuite/utils/test_suite-scenarios.adb +++ b/testsuite/utils/test_suite-scenarios.adb @@ -250,13 +250,6 @@ Log (Output, Natural'Image (Total_Tests - Total_Failed_Tests) & " out of" & Natural'Image (Total_Tests) & " tests passed"); - - if Verbose then - Put_Line (Natural'Image (Scenarios) & " scenarios executed,"); - Put_Line (Natural'Image (Total_Tests - Total_Failed_Tests) - & " out of" & Natural'Image (Total_Tests) - & " tests passed"); - end if; end Run_All_Scenarios; end Test_Suite.Scenarios; debian/libpolyorb3.docs0000644000000000000000000000002711761151277012307 0ustar FEATURES debian/README debian/README.Debian0000644000000000000000000000167611761151277011251 0ustar polyorb for Debian ------------------ The current Debian package supports the following personalities: Application Personalities ========================= * CORBA * DSA * MOMA Protocol Personalities ====================== * GIOP We will try to provide additional personalities in the future. Limitations ----------- CORBA SSLIOP and TLS security services are disabled for now, because they are based on OpenSSL. OpenSSL's license is incompatible with the GPL, therefore it is illegal to distribute a binary package of GPL'd software linked with OpenSSL in Debian. We'll try to replace OpenSSL-based SSL/TLS with gnutls in the future. The DSA polyorb personality uses project "extends" keywords when the -P option is given to po_gnatdist. According to bug #559447 this leads to errors, the extends seems to "hide" the withed project in the user project file. DSA is still functional, one only needs to pass source PATHs using the -I option.