Ignore:
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Orange/OrangeCanvas/orngRegistry.py

    r9671 r10453  
    3535    
    3636def readCategories(silent=False): 
    37     currentCacheVersion = 2 
     37    try: 
     38        from Orange.version import version as orange_version 
     39    except ImportError: 
     40        # Orange.version module is writen by setup.py, what if orange was build 
     41        # using make 
     42        orange_version = "???" 
     43    # Add orange version to the cache version (because cache contains names 
     44    # of types inside the Orange hierarchy, if that changes the cache should be 
     45    # invalidated) 
     46    currentCacheVersion = (2, orange_version) 
    3847     
    3948    global widgetsWithError, widgetsWithErrorPrototypes 
     
    5463        else: 
    5564            cachedWidgetDescriptions = {} 
    56     except: 
     65    except Exception: 
    5766        cachedWidgetDescriptions = {}  
    5867 
  • install-scripts/mac/fink-update-local.sh

    r10448 r10451  
    1616WORK_DIR=$1 
    1717SOURCES_DIR=$2 
     18 
     19FORCE=true 
    1820 
    1921# First build all the source packages 
     
    4648fi 
    4749 
    48 if [ ! -e $SOURCES_DIR/$ORANGE_SOURCE ]; then 
     50if [[ ! -e $SOURCES_DIR/$ORANGE_SOURCE || $FORCE ]]; then 
    4951    cp $WORK_DIR/$ORANGE_SOURCE $SOURCES_DIR/$ORANGE_SOURCE 
    5052    NEW_ORANGE=1 
    5153fi 
    5254 
    53 if [ ! -e $SOURCES_DIR/BIOINFORMATICS_SOURCE ]; then 
     55if [[ ! -e $SOURCES_DIR/BIOINFORMATICS_SOURCE || $FORCE ]]; then 
    5456    cp $WORK_DIR/$BIOINFORMATICS_SOURCE $SOURCES_DIR/$BIOINFORMATICS_SOURCE 
    5557    NEW_BIOINFORMATICS=1 
    5658fi 
    5759 
    58 if [ ! -e $SOURCES_DIR/TEXT_SOURCE ]; then 
     60if [[ ! -e $SOURCES_DIR/TEXT_SOURCE || $FORCE ]]; then 
    5961    cp $WORK_DIR/$TEXT_SOURCE $SOURCES_DIR/$TEXT_SOURCE 
    6062    NEW_TEXT=1 
  • install-scripts/mac/fink/orange-gui-hg-py.info

    r10441 r10454  
    6767        lib/python%type_raw[python]/site-packages/Orange-orng-modules.pth 
    6868        share/doc/orange-hg-py%type_pkg[python] 
    69         bin/orange-canvas%type_pkg[python] 
     69        bin/orange-canvas%type_raw[python] 
    7070    << 
    7171<< 
     
    7979    %p/bin/python%type_raw[python] setup.py build 
    8080     
    81     # Compile scripts later on assume Python executable is named "python" - so we give them that 
    82     #export PATH=%b:$PATH 
    83     #ln -s %p/bin/python%type_raw[python] python 
    84      
    8581    # To build orangeqt module we need to force cmake to look in 
    8682    # the proper places. 
     
    9086    # And cmake to find PyQt4 
    9187    export PYTHONPATH=%p/lib/qt4-mac/lib/python%type_raw[python]/site-packages/ 
     88     
     89    # Try every thing possible to convince cmake to use our python 
     90    export PATH=%b:$PATH 
     91    ln -s %p/bin/python%type_raw[python] python 
     92    ln -s %p/bin/python%type_raw[python] python%type_raw[python] 
    9293 
    9394    # Finally compile orangeqt  
     
    9899    make VERBOSE=1 
    99100    cd ../../../ 
     101     
     102    # Clean up the python sym links  
     103    rm python 
     104    rm python%type_raw[python] 
    100105     
    101106    # Prepares bundle 
     
    140145    mv Orange/doc/* %i/share/doc/orange-hg-py%type_pkg[python]/ 
    141146 
    142     # Add python version to bin/orange-canvas script 
    143     mv %i/bin/orange-canvas %i/bin/orange-canvas%type_pkg[python] 
     147    # Add python version to bin/orange-canvas script 
     148    mv %i/bin/orange-canvas %i/bin/orange-canvas%type_raw[python] 
    144149<< 
    145150<< 
Note: See TracChangeset for help on using the changeset viewer.