Changeset 11643:9097e985303b in orange


Ignore:
Timestamp:
07/24/13 19:51:43 (9 months ago)
Author:
janezd <janez.demsar@…>
Branch:
default
Message:

Added parentheses in prints in setup of orangeqt for compatibility with Python 3.0.

Location:
source/orangeqt
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • source/orangeqt/Makefile

    r11087 r11643  
    77endif 
    88 
    9 PYTHON_VERSION = $(shell $(PYTHON) -c 'import sys; print "%s.%s" % sys.version_info[:2]') 
     9PYTHON_VERSION = $(shell $(PYTHON) -c 'import sys; print("%s.%s" % sys.version_info[:2])') 
    1010OS = $(shell uname) 
    1111 
     
    1717    install_name_tool -id $(DESTDIR)/orangeqt.so $(OLD)/orangeqt.so 
    1818endif 
    19      
     19 
    2020 
    2121cleantemp: 
  • source/orangeqt/modules/FindNumpy.cmake

    r9048 r11643  
    1515#endif (NUMPY_INCLUDE_DIR) 
    1616 
    17 EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c  
    18     "import numpy; print numpy.get_include()" 
     17EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c 
     18    "import numpy; print(numpy.get_include())" 
    1919    OUTPUT_VARIABLE NUMPY_INCLUDE_DIR 
    2020    OUTPUT_STRIP_TRAILING_WHITESPACE) 
  • source/orangeqt/modules/SIPMacros.cmake

    r8757 r11643  
    111111    ENDIF(NOT WIN32) 
    112112    ADD_CUSTOM_COMMAND( 
    113         OUTPUT ${_sip_output_files}  
     113        OUTPUT ${_sip_output_files} 
    114114        COMMAND ${CMAKE_COMMAND} -E echo ${message} 
    115         COMMAND ${TOUCH_COMMAND} ${_sip_output_files}  
     115        COMMAND ${TOUCH_COMMAND} ${_sip_output_files} 
    116116        COMMAND ${SIP_EXECUTABLE} ${_sip_tags} ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_SIP_OUTPUT_DIR} ${_sip_includes} ${_abs_module_sip} 
    117117        DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND} 
     
    123123        ADD_LIBRARY(${_logical_name} SHARED ${SIP_EXTRA_SOURCES} ${_sip_output_files} ) 
    124124    ENDIF (CYGWIN) 
    125      
     125 
    126126#   IF (WIN32) 
    127 #       SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES SUFFIX ".pyd")  
     127#       SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES SUFFIX ".pyd") 
    128128#   ENDIF (WIN32) 
    129129 
    130130#   Use sysconfig to get the python module extension 
    131     execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('SO')"  
    132                     RESULT_VARIABLE PYTHON_SOPY_PROCESS  
    133                     OUTPUT_VARIABLE PY_SO_SUFFIX  
     131    execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('SO'))" 
     132                    RESULT_VARIABLE PYTHON_SOPY_PROCESS 
     133                    OUTPUT_VARIABLE PY_SO_SUFFIX 
    134134                    OUTPUT_STRIP_TRAILING_WHITESPACE) 
    135135    SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES SUFFIX ${PY_SO_SUFFIX}) 
Note: See TracChangeset for help on using the changeset viewer.