[Pkg-ace-devel] r4 - in trunk/debian: . config patches
svn-commits@bignachos.com
svn-commits@bignachos.com
Mon, 31 May 2004 20:20:24 -0700 (PDT)
Author: nelson
Date: Mon May 31 20:20:23 2004
New Revision: 4
Added:
trunk/debian/ace+tao-utilities.docs
trunk/debian/ace+tao-utilities.install
trunk/debian/gperf-ace.dirs
trunk/debian/gperf-ace.links
trunk/debian/patches/
Modified:
trunk/debian/changelog
trunk/debian/config/config.h
trunk/debian/config/platform_macros.GNU
trunk/debian/control
trunk/debian/rules
Log:
Merged in KM's 5.4.1-1 updates, added dpatch support
Added: trunk/debian/ace+tao-utilities.docs
==============================================================================
--- (empty file)
+++ trunk/debian/ace+tao-utilities.docs Mon May 31 20:20:23 2004
@@ -0,0 +1,2 @@
+PROBLEM-REPORT-FORM
+README
Added: trunk/debian/ace+tao-utilities.install
==============================================================================
--- (empty file)
+++ trunk/debian/ace+tao-utilities.install Mon May 31 20:20:23 2004
@@ -0,0 +1 @@
+bin/* usr/share/ace/bin
Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Mon May 31 20:20:23 2004
@@ -1,3 +1,18 @@
+ace (5.4.1-1) UNRELEASED; urgency=low
+
+ * KM: new upstream release
+ - Fixes tao_idl compilation problem (Closes: #243062)
+ * Reactivate ACE_IOStream for gcc > 3.2, Closes: #243473. Thanks to patch
+ from Alexander Motzkau <a.motzkau@web.de>
+ * Used patch from Raphael Raphael Bossek <bossekr@debian.org> to fix the
+ following (Closes: #242881)
+ - Fixed ACE_NDEBUG configuration of ACE.
+ - System capabilities will be determined by including <unistd.h> in
+ <ace/config.h>
+ * Use dpatch to manage the patches. Added dpatch to the build-depends.
+
+ -- Brian Nelson <pyro@debian.org> Tue, 1 Jun 2004 00:23:57 -0300
+
ace (5.4.0.1-1) unstable; urgency=low
* KM: release to fix the timestamp errors in the upstream source.
Modified: trunk/debian/config/config.h
==============================================================================
--- trunk/debian/config/config.h (original)
+++ trunk/debian/config/config.h Mon May 31 20:20:23 2004
@@ -7,27 +7,14 @@
// Force exception support to be enabled.
#define ACE_HAS_EXCEPTIONS 1
-// No need for the ACE_ASSERTions and RCSIDs since this is a "release"
-// (i.e. non-debug) build.
-#define ACE_NDEBUG 1
-#define ACE_USE_RCSID 0
-
// Force support for timeprobes to be compiled.
#define ACE_COMPILE_TIMEPROBES 1
// Force support for POSIX Asynchronous IO (AIO) to be compiled.
#define ACE_HAS_AIO_CALLS 1
-// BN: hmm, not sure if these are needed?
-#ifndef POSIX_THREADS
-# define POSIX_THREADS
-#endif
-#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-# define _POSIX_THREAD_SAFE_FUNCTIONS
-#endif
-#ifndef _REENTRANT
-# define _REENTRANT
-#endif
+// bossekr@debian.org: Get the system capabilities.
+#include <unistd.h>
// -------------------------------
Modified: trunk/debian/config/platform_macros.GNU
==============================================================================
--- trunk/debian/config/platform_macros.GNU (original)
+++ trunk/debian/config/platform_macros.GNU Mon May 31 20:20:23 2004
@@ -13,13 +13,6 @@
# Enable thread support.
threads=1
-# Enable optimizations.
-optimize=1
-
-# Disable debugging symbol generation and configure for a "release"
-# build.
-debug=0
-
# Enable ssl support
ssl=1
Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control (original)
+++ trunk/debian/control Mon May 31 20:20:23 2004
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian ACE+TAO maintainers <pkg-ace-devel@lists.alioth.debian.org>
Uploaders: Konstantinos Margaritis <markos@debian.org>, Brian Nelson <pyro@debian.org>
-Build-Depends: debhelper (>= 4.1), libssl-dev, libqt3-headers, xlibs-dev (>= 4.2)
+Build-Depends: debhelper (>= 4.1), libssl-dev, xlibs-dev (>= 4.2), dpatch
Standards-Version: 3.6.1
Package: libace5.4
@@ -282,3 +282,11 @@
.
CIAO is TAO's implementation of CORBA Component Model (CCM) specially
optimized for distributed real-time embedded (DRE) systems
+
+Package: ace+tao-utilities
+Architecture: any
+Section: devel
+Description: Misc utilities useful for ACE+TAO
+ ACE+TAO upstream packages provide miscellaneous utilities to
+ test/profile/benchmark. They are not necessary for development with
+ ACE+TAO+CIAO, but they might be useful to some people.
Added: trunk/debian/gperf-ace.dirs
==============================================================================
--- (empty file)
+++ trunk/debian/gperf-ace.dirs Mon May 31 20:20:23 2004
@@ -0,0 +1 @@
+/usr/share/ace/bin
Added: trunk/debian/gperf-ace.links
==============================================================================
--- (empty file)
+++ trunk/debian/gperf-ace.links Mon May 31 20:20:23 2004
@@ -0,0 +1 @@
+usr/bin/gperf-ace usr/share/ace/bin/
Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Mon May 31 20:20:23 2004
@@ -14,22 +14,33 @@
TAO_MAJOR_VERSION := $(shell grep TAO_MAJOR_VERSION TAO/tao/Version.h | sed -e 's/\#define TAO_MAJOR_VERSION //')
TAO_VERSION := $(shell grep TAO_MAJOR_VERSION TAO/tao/Version.h | sed -e 's/\#define TAO_MAJOR_VERSION //')
-ACE_OPTS = "probe=1 exceptions=1 threads=1 optimize=1 debug=0 ssl=1"
+# This settings are only active while building ACE & Co. but never active while
+# user's applications are developed with ACE & Co.
+MAKEENV := CPPFLAGS="-DACE_NDEBUG -DACE_USE_RCSID"
+
+Include /usr/share/dpatch/dpatch.make
build: build-stamp
build-stamp:
dh_testdir
cp debian/config/config.h ace
- cp debian/config/platform_macros.GNU include/makeinclude
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ echo "debug=1" > include/makeinclude/platform_macros.GNU
+ echo "optimize=0" >> include/makeinclude/platform_macros.GNU
+else
+ echo "debug=0" > include/makeinclude/platform_macros.GNU
+ echo "optimize=1" >> include/makeinclude/platform_macros.GNU
+endif
+ cat debian/config/platform_macros.GNU >> include/makeinclude/platform_macros.GNU
- $(MAKE) -C ace shared_libs=1 static_libs=1
- $(MAKE) -C ACEXML shared_libs=1 static_libs=1
+ $(MAKEENV) $(MAKE) -C ace shared_libs=1 static_libs=1
+ $(MAKEENV) $(MAKE) -C ACEXML shared_libs=1 static_libs=1
- $(MAKE) -C apps/gperf/src
- $(MAKE) -C Kokyu shared_libs=1 static_libs=1
+ $(MAKEENV) $(MAKE) -C apps/gperf/src
+ $(MAKEENV) $(MAKE) -C Kokyu shared_libs=1 static_libs=1
- cd $(TAO_ROOT) && LD_LIBRARY_PATH=$(ACE_ROOT)/ace make shared_libs=1 corba_messaging=1 rtcorba=1
+ cd $(TAO_ROOT) && LD_LIBRARY_PATH=$(ACE_ROOT)/ace $(MAKEENV) make shared_libs=1 corba_messaging=1 rtcorba=1
touch build-stamp
@@ -46,7 +57,7 @@
-$(MAKE) -C TAO realclean shared_libs=1
-$(MAKE) -C TAO realclean static_libs=1
- rm -f ace/*.{a,so*} ace/RMCast/*.{a,so*} apps/gperf/src/gperf-ace \
+ rm -f ace/*.{a,so*} ace/RMCast/*.{a,so*} bin/gperf-ace apps/gperf/src/gperf-ace \
apps/gperf/gperf-ace.1 apps/gperf/gperf-ace.info ace/config.h \
include/makeinclude/platform_macros.GNU