- autopackage support (untested)

.cvsignore

@@ -35,3 +35,5 @@ mkinstalldirs
 aeskulap-0.1.0
 *.tar.gz.sig
 log
+*.package
+uninstalldirs

acinclude.m4

@@ -0,0 +1,77 @@
+# Check for binary relocation support.
+# Written by Hongli Lai
+# http://autopackage.org/
+
+AC_DEFUN([AM_BINRELOC],
+[
+	AC_ARG_ENABLE(binreloc,
+		[  --enable-binreloc       compile with binary relocation support
+                          (default=enable when available)],
+		enable_binreloc=$enableval,enable_binreloc=auto)
+
+	AC_ARG_ENABLE(binreloc-threads,
+		[  --enable-binreloc-threads      compile binary relocation with threads support
+	                         (default=yes)],
+		enable_binreloc_threads=$enableval,enable_binreloc_threads=yes)
+
+	BINRELOC_CFLAGS=
+	BINRELOC_LIBS=
+	if test "x$enable_binreloc" = "xauto"; then
+		AC_CHECK_FILE([/proc/self/maps])
+		AC_CACHE_CHECK([whether everything is installed to the same prefix],
+			       [br_cv_valid_prefixes], [
+				if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \
+					"$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \
+					"$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc'
+				then
+					br_cv_valid_prefixes=yes
+				else
+					br_cv_valid_prefixes=no
+				fi
+				])
+	fi
+	AC_CACHE_CHECK([whether binary relocation support should be enabled],
+		       [br_cv_binreloc],
+		       [if test "x$enable_binreloc" = "xyes"; then
+		       	       br_cv_binreloc=yes
+		       elif test "x$enable_binreloc" = "xauto"; then
+			       if test "x$br_cv_valid_prefixes" = "xyes" -a \
+			       	       "x$ac_cv_file__proc_self_maps" = "xyes"; then
+				       br_cv_binreloc=yes
+			       else
+				       br_cv_binreloc=no
+			       fi
+		       else
+			       br_cv_binreloc=no
+		       fi])
+
+	if test "x$br_cv_binreloc" = "xyes"; then
+		BINRELOC_CFLAGS="-DENABLE_BINRELOC"
+		AC_DEFINE(ENABLE_BINRELOC,,[Use binary relocation?])
+		if test "x$enable_binreloc_threads" = "xyes"; then
+			AC_CHECK_LIB([pthread], [pthread_getspecific])
+		fi
+
+		AC_CACHE_CHECK([whether binary relocation should use threads],
+			       [br_cv_binreloc_threads],
+			       [if test "x$enable_binreloc_threads" = "xyes"; then
+					if test "x$ac_cv_lib_pthread_pthread_getspecific" = "xyes"; then
+						br_cv_binreloc_threads=yes
+					else
+						br_cv_binreloc_threads=no
+					fi
+			        else
+					br_cv_binreloc_threads=no
+				fi])
+
+		if test "x$br_cv_binreloc_threads" = "xyes"; then
+			BINRELOC_LIBS="-lpthread"
+			AC_DEFINE(BR_PTHREAD,1,[Include pthread support for binary relocation?])
+		else
+			BINRELOC_CFLAGS="$BINRELOC_CFLAGS -DBR_PTHREADS=0"
+			AC_DEFINE(BR_PTHREAD,0,[Include pthread support for binary relocation?])
+		fi
+	fi
+	AC_SUBST(BINRELOC_CFLAGS)
+	AC_SUBST(BINRELOC_LIBS)
+])

autopackage/default.apspec.in

@@ -0,0 +1,73 @@
+# -*-shell-script-*-
+
+[Meta]
+RootName: @aeskulap.nongnu.org/aeskulap:$SOFTWAREVERSION
+DisplayName: Aeskulap DICOM Viewer
+ShortName: aeskulap
+Maintainer: Alexander Pipelka <pipelka@teleweb.at>
+Packager: Alexander Pipelka <pipelka@teleweb.at>
+Summary: Aeskulap is a medical image viewer and DICOM network client.
+URL: http://aeskulap.nongnu.org/
+License: GNU General Public License, Version 2
+SoftwareVersion: @VERSION@
+PackageVersion: 1
+AutopackageTarget: 1.0
+
+# Only uncomment InterfaceVersion if your package exposes interfaces to other software,
+# for instance if it includes DSOs or python/perl modules. See the developer guide for more info,
+# or ask on autopackage-dev if you don't understand interface versioning in autopackage.
+#
+InterfaceVersion: 0.0
+
+[Description]
+Aeskulap is a medical image viewer.
+It is able to load a series of special images stored 
+in the DICOM format for review. Additionally Aeskulap 
+is able to query and fetch DICOM images from archive 
+nodes (also called PACS) over the network.
+The goal of this project is to create a full open source 
+replacement for commercially available DICOM viewers.
+
+[BuildPrepare]
+if [ ! -x configure ] ; then
+	sh autogen.sh
+fi
+export APBUILD_STATIC="Xrender glademm-2.4 gconfmm-2.6 gtkmm-24 glibmm-2.4 pangomm-1.4"
+export CC="apgcc"
+export CXX="apg++"
+prepareBuild --enable-binreloc
+
+[BuildUnprepare]
+unprepareBuild
+
+[Imports]
+echo '*' | import
+
+[Prepare]
+# Dependency checking
+require @gnu.org/libstdc++ 3
+require @xmlsoft.org/libxml2 2.6
+require @rpm.org/popt 0.0
+require @libsigc.sourceforge.net/libsigc 3
+#require @gtkmm.org/gtkmm2 3
+require @libpng.org/libpng 3
+require @zlib.org/zlib 1
+
+[Install]
+# Put your installation script here
+installExe bin/*
+installLib lib/*.so.*
+installLib lib/aeskulap/*.so
+
+copyFiles --nobackup share/locale $PREFIX/share
+copyFiles share/aeskulap $PREFIX/share
+#copyFiles lib/aeskulap $PREFIX/lib
+#copyFiles lib $PREFIX
+
+installIcon share/aeskulap/images/aeskulap.png
+installDesktop "Graphics" share/applications/aeskulap.desktop
+installGConfSchema share/gconf/schemas/aeskulap.schema
+
+[Uninstall]
+# Usually just the following line is enough to uninstall everything
+uninstallFromLog

configure.in

@@ -15,6 +15,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_PROG_INSTALL
+AM_BINRELOC
 
 ALL_LINGUAS="en de es hu pt"
 AM_GNU_GETTEXT

debian/changelog

@@ -1,3 +1,9 @@
+aeskulap (0.2.1-1a4) unstable; urgency=low
+
+  * autopackage support (untested)
+
+ -- Alexander Pipelka <pipelka@bms-austria.com>  Mon, 30 Jan 2006 10:07:53 +0100
+
 aeskulap (0.2.1-1a3) unstable; urgency=low
 
   * translation fixes

src/Makefile.am

@@ -1,6 +1,7 @@
 bin_PROGRAMS = aeskulap
 
 aeskulap_SOURCES = \
+	binreloc.c \
 	astockids.cpp \
 	astockids.h \
 	aiconfactory.cpp \
@@ -39,6 +40,7 @@ install-data-hook:
 	GCONF_CONFIG_SOURCE="" gconftool-2 --makefile-install-rule $(srcdir)/$(schema_DATA) || true
 
 INCLUDES = \
+	-DAESKULAP_DATADIR=\""$(datadir)"\" \
 	-DAESKULAP_GLADEDIR=\""$(gladedir)"\" \
 	-DAESKULAP_IMAGESDIR=\""$(aeskulap_images_dir)"\" \
 	-DLOCALEDIR=\""$(datadir)/locale"\" \

src/aiconfactory.cpp

@@ -22,20 +22,29 @@
     pipelka@teleweb.at
 
     Last Update:      $Author: braindead $
-    Update Date:      $Date: 2006/01/26 12:30:50 $
+    Update Date:      $Date: 2006/01/30 09:09:34 $
     Source File:      $Source: /cvsroot/aeskulap/aeskulap/src/aiconfactory.cpp,v $
-    CVS/RCS Revision: $Revision: 1.8 $
+    CVS/RCS Revision: $Revision: 1.9 $
     Status:           $State: Exp $
 */
 
 #include "aiconfactory.h"
 #include "astockids.h"
+#include "binreloc.h"
 
 #include <iostream>
 
 namespace Aeskulap {
 
+std::string IconFactory::m_datadir;
+std::string IconFactory::m_imagesdir;
+
 IconFactory::IconFactory() {
+	if(m_datadir.empty()) {
+        	m_datadir = br_find_data_dir(AESKULAP_DATADIR);
+		m_imagesdir = m_datadir + "/aeskulap/images";
+	}
+
 	add(Stock::GRID_1X1, "grid-1.png");
 	add(Stock::GRID_1X2, "grid-2h.png");
 	add(Stock::GRID_2X1, "grid-2v.png");
@@ -85,7 +94,7 @@ Glib::RefPtr<Gdk::Pixbuf> IconFactory::load_from_file(const std::string& filenam
 	std::string path;
 
 	try {
-		path = AESKULAP_IMAGESDIR + std::string("/") + filename;
+		path = m_imagesdir + std::string("/") + filename;
 		std::cerr << "trying to load '" << path << "'" << std::endl;
 		pixbuf = Gdk::Pixbuf::create_from_file(path);
 	}

src/aiconfactory.h

@@ -22,9 +22,9 @@
     pipelka@teleweb.at
 
     Last Update:      $Author: braindead $
-    Update Date:      $Date: 2005/09/01 09:44:03 $
+    Update Date:      $Date: 2006/01/30 09:09:34 $
     Source File:      $Source: /cvsroot/aeskulap/aeskulap/src/aiconfactory.h,v $
-    CVS/RCS Revision: $Revision: 1.2 $
+    CVS/RCS Revision: $Revision: 1.3 $
     Status:           $State: Exp $
 */
 
@@ -34,6 +34,7 @@
 #include <gtkmm.h>
 #include <gdkmm/pixbuf.h>
 #include <vector>
+#include <string>
 
 namespace Aeskulap {
 
@@ -53,6 +54,10 @@ class IconFactory : public Gtk::IconFactory {
 private:
 
 	std::vector<Gtk::IconSet*> m_iconset;
+
+	static std::string m_datadir;
+
+	static std::string m_imagesdir;
 };
 
 } // namespace Aeskulap