Changeset 511 for trunk


Ignore:
Timestamp:
Aug 16, 2006, 9:19:48 PM (18 years ago)
Author:
dkearney
Message:

moving all .h files to their respective src directories, updating tools.py to include python's re module, updated setup.py.in to use .h files from the installed version of rappture and to adapt to the new location of .h files. .h files are now all stored in the lib directory under the rappture installation folder. this should simplify people's code, so they dont have to include wierd search paths for header files. adjusted the paths in rappture.in, allowing people to use their own version of python and perl. octave on the other hand is still broken for people downloading our binary and not using libhdf5-1.6.2. src's makefile.in was modified to copy the .h files from the core and cee directories over to the rappture installation directory. the top level makefile.in has all kinds of changes mainly you can now type in ./configure --prefix=... --with-matlab=... and then make install. this will build and install the gui, language bindings, and examples. these changes will probably break the automatic builds but the necessary changes to the rappture-runtime package should be committed in good time.

Location:
trunk
Files:
1 deleted
5 edited
23 moved

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.in

    r508 r511  
    1 all: rplib bindings
    2 install: install_rplib install_bindings install_examples
     1all: rplib build_bindings
     2install: rp_gui install_rplib install_bindings install_examples
     3        chmod 755 gui/apps/rappture
     4        cp gui/apps/rappture @prefix@/bin
     5        cp gui/apps/driver @prefix@/bin
     6        cp gui/apps/rerun @prefix@/bin
     7        find @prefix@ -name .svn | xargs rm -rf
    38
    49###########################################################################
    … …  
    611#############################################################################
    712
     13rp_gui:
     14        set -x;
     15        cd gui; \
     16        make clean; make distclean; \
     17        ./configure --prefix=@prefix@ --with-blt=@prefix@/include; \
     18        make all; \
     19        make install;
     20
     21#       make all >& $(basedir)/output.gui 2>&1; \
     22#       make install >> $(basedir)/output.gui 2>&1
    823
    924rplib:
    … …  
    1328install_rplib:
    1429        set -x;
    15         cd src; make install
     30        cd src; make install_rappture;
    1631
    17 bindings:
    18         set -x;
    19         cd src;                 \
    20         make RpMatlab;  \
    21         make RpOctave;  \
    22         cd -
    23 #       make RpTcl;
    24         make build_python_bindings;
    25         make build_perl_bindings;
     32build_bindings: build_matlab build_octave build_python build_perl
    2633
    27 install_bindings:
     34install_bindings: install_matlab install_octave install_python install_perl install_tcl
    2835
    2936#############################################################################
    … …  
    3239#       - compile rappture examples in rappture/examples
    3340#############################################################################
    34 examples:
     41build_examples:
    3542        set -x;
    3643        cd examples/app-fermi/fortran; make clean; make; cd -
    … …  
    3845        cd examples/c-example; make clean; make; cd -
    3946
    40 install_examples: examples
     47install_examples: build_examples
     48        set -x;
     49        cp -r examples @prefix@
     50
     51
    4152
    4253#############################################################################
    4354
    44 build_python_bindings:
     55#tcl bindings
     56install_tcl:
     57        cd tcl; @prefix@/bin/tclsh install.tcl
     58#       cd tcl; @TCLSH@ install.tcl
     59
     60# matlab bindings
     61build_matlab:
     62        cd src/matlab; make clean; make RpMatlab; cd -
     63
     64install_matlab: build_matlab
     65        cd src/matlab; make install; cd -
     66
     67# octave bindings
     68build_octave:
     69        cd src/octave; make clean; make RpOctave; cd -
     70
     71install_octave: build_octave
     72        cd src/octave; make install; cd -
     73
     74build_python:
    4575        set -x;
    4676        cd python; \
    … …  
    5181                build
    5282
    53 install_python_bindings: build_python_bindings
     83install_python: build_python
    5484        set -x;
    5585        cd python; \
    5686        @PYTHON@ setup.py install --prefix=@prefix@
    5787
    58 build_perl_bindings:
     88build_perl:
    5989        set -x;
    6090        cd perl; \
    … …  
    6292        make; make test;
    6393
    64 install_perl_bindings: build_perl_bindings
     94install_perl: build_perl
    6595        set -x;
    6696        cd perl; make install;

  • trunk/gui/apps/rappture.in

    r492 r511  
    2020# no need to edit the rest...
    2121export PATH=$RAPPTURE_INSTALL_DIR/bin:$PATH
     22export PERL5PATH=$RAPPTURE_INSTALL_DIR/lib/perl5:$PERL5PATH
     23export PYTHONPATH=$RAPPTURE_INSTALL_DIR/lib/python2.3/site-packages:$PYTHONPATH
    2224export MATLABPATH=$RAPPTURE_INSTALL_DIR/lib/matlab:$MATLABPATH
    2325export OCTAVE_PATH=:$RAPPTURE_INSTALL_DIR/lib/octave:$OCTAVE_PATH

  • trunk/python/Rappture/tools.py

    r497 r511  
    66# ======================================================================
    77
    8 import sys, os
     8import sys, os, re
    99
    1010def getCommandOutput(command):

  • trunk/python/setup.py.in

    r497 r511  
    44
    55module = Extension('Rappture.Units',
    6                    include_dirs = [rp_install_dir+'/include/core'],
     6                   include_dirs = [rp_install_dir+'/include'],
    77                   sources = [ 'Rappture/PyRpUnits.cc' ],
    88                   library_dirs = [ rp_install_dir+'/lib' ],

  • trunk/src/Makefile.in

    r508 r511  
    9494                cp $<.dylib $(RP_INSTALL_BASE)/lib; \
    9595                cp $<.a $(RP_INSTALL_BASE)/lib; \
     96                cp $(CORE_SRC)/*.h $(RP_INSTALL_BASE)/include; \
     97                cp $(CEE_SRC)/*.h $(RP_INSTALL_BASE)/include; \
    9698        else \
    9799                cp -d $<.so* $(RP_INSTALL_BASE)/lib; \
    98100                cp -d $<.a $(RP_INSTALL_BASE)/lib; \
     101                cp $(CORE_SRC)/*.h $(RP_INSTALL_BASE)/include; \
     102                cp $(CEE_SRC)/*.h $(RP_INSTALL_BASE)/include; \
    99103        fi
    100104
Note: See TracChangeset for help on using the changeset viewer.