diff --git a/ChangeLog b/ChangeLog index cd1749e..583d033 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,11 @@ -2011-10-06 Juergen Knoedlseder +2011-10-20 Juergen Knoedlseder * Version 0.3.0 released ======================== Renamed to ctools + Add configure options for Mac OSX universal builds + Remove automake dependency tracking 2011-10-03 Juergen Knoedlseder diff --git a/NEWS b/NEWS index 715157b..0559ddc 100644 --- a/NEWS +++ b/NEWS @@ -1,59 +1,60 @@ -New Features and Important Changes in ctools 00-03-00 +New Features and Important Changes in ctools 00-04-00 Author(s) : Juergen Knoedlseder -October 6, 2011 +October 20, 2011 1. Introduction --------------- This document briefly summarizes executable by executable the most important changes made since the last release of ctools. - 2. Configuration ----------------- -Renamed package from ctatools to ctools +The configure options --enable-universalsdk and --with-universal-archs +have been added to control building of universal libraries. This is +particularily required if the installed Python architecture differs from +the default architecture created by the compiler. +Remove automake dependency tracking as this conflicts with Mac OS X +universal builds. 3. Python interface ------------------- None - 4. ctobssim - CTA observation simulation ---------------------------------------- None - 5. ctselect - CTA event selection --------------------------------- None - 6. ctbin - CTA event binning ---------------------------- None - 7. ctlike - CTA maximum likelihood fitting ------------------------------------------ None +8. ctskymap - CTA sky mapping +----------------------------- +New executable. -8. Examples +9. Examples ----------- None - -9. Scripts ----------- +10. Scripts +----------- None -10. caldb +11. caldb --------- None - -11. models +12. models ---------- None diff --git a/README b/README index 69179bc..bf18f46 100644 --- a/README +++ b/README @@ -1,8 +1,8 @@ ctools information ================== -Version: 00-03-05 (October 6, 2011) +Version: 00-04-00 (October 20, 2011) Author: Juergen Knodlseder (knodlseder@cesr.fr) -GammaLib dependency: 00-04-11 +GammaLib dependency: 00-05-00 License information @@ -38,6 +38,7 @@ The following tools are so far available: ctselect - event selection ctbin - event binning ctlike - maximum likelihood model fitting + ctskymap - CTA sky mapping tool Web sites @@ -96,19 +97,50 @@ The file INSTALL details more about using configure. Also try Macintosh OS X Installation ============================ -ctools are known to work on various flavors of OS X. Follow the Unix -installation instructions above. +ctools is known to work on various flavors of OS X. To cope with +different system versions and architectures, there are two Mac +specific configure options: -In some cases, install problems have been reported with mixed -architectures (i386, ppc, x86_64), so you may configure and build -as follows to enable building a bundle for various architectures: + % ./configure --enable-universalsdk[=PATH] - % export CXXFLAGS="-arch ppc -arch i386 -arch x86_64" - % export LDFLAGS="-arch ppc -arch i386 -arch x86_64" - % ./configure - % make - % make check - % make install +creates a universal build of ctools. The optional argument specifies +which OSX SDK should be used to perform the build. This defaults to +"/Developer/SDKs/MacOSX.10.4u.sdk". Specify "/" when building on a 10.5 +system or higher, especially when building 64-bit code. + + % ./configure --with-univeral-archs=VALUE + +specifies the kind of universal build that should be created. Possible +values are: "32-bit", "3-way", "intel" or "all". By default, a "32-bit" +build will be made. This option is only valid when +"--enable-universalsdk" is specified. + +These options are in particular needed if your Python architecture differs +from the default architecture of your system. To examine the Python +architecture you may type: + + % file `which python` + +which will return the architectures that are compiled in the Mach-0 +executable: + + i386 32-bit intel + ppc 32-bit powerpc + ppc64 64-bit powerpc + x86_64 64-bit intel + +If Python is 32-bit (ppc, i386) but the compiler produces by default +64-bit code (ppc64, x86_64), the Python module will not work. Using + + % ./configure --enable-universalsdk=/ + +will force a universal 32-bit build which creates code for ppc and +i386. If on the other hand Python is 64-bit (ppc64, x86_64) but the +compiler produces by default 32-bit code (ppc, i386), the option + + % ./configure --enable-universalsdk=/ --with-univeral-archs=3-way + +will generate a universal build which contains 32-bit and 64-bit code. Solaris Installation diff --git a/configure.ac b/configure.ac index 91d5b45..c2ead5a 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ ############################################################################# # Initialisation # ############################################################################# -AC_INIT([ctools], [0.3.0], [knodlseder@cesr.fr], [ctools]) +AC_INIT([ctools], [0.4.0], [knodlseder@cesr.fr], [ctools]) AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([gnu no-dependencies]) diff --git a/ctools.pc.in b/ctools.pc.in index 4553e8f..a4d1f1c 100644 --- a/ctools.pc.in +++ b/ctools.pc.in @@ -6,9 +6,9 @@ includedir=${prefix}/include Name: ctools Description: CTA science analysis tools URL: http://cta.irap.omp.eu/ctools -Version: 0.2.5 +Version: 0.4.0 Requires: -Requires.private: GammaLib >= 0.4.11 +Requires.private: GammaLib >= 0.5.0 Conflicts: Cflags: -I${includedir}/ctools Libs: -L${libdir} -lctools