Changeset 6643


Ignore:
Timestamp:
07/02/10 18:25:47 (9 years ago)
Author:
curtis
Message:

Fix Jace paths to work pre-r46, with commented out code for r46+.
Add readme notes about how the latest revisions of Jace don't work.

Location:
trunk/components/native/bf-cpp
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/native/bf-cpp/CMakeLists.txt

    r6641 r6643  
    4949add_subdirectory(jace) 
    5050 
    51 message(STATUS "-- Jace:") 
    52 set(JACE_DIR NOTFOUND CACHE PATH 
    53   "The path to toplevel directory of your Jace checkout") 
    54 if(IS_DIRECTORY "${JACE_DIR}") 
    55   message(STATUS "jace root     : ${JACE_DIR}") 
    56 else(IS_DIRECTORY "${JACE_DIR}") 
    57   message(FATAL_ERROR "Cannot build without Jace. Please set JACE_DIR.") 
    58 endif(IS_DIRECTORY "${JACE_DIR}") 
     51#message(STATUS "-- Jace:") 
     52#set(JACE_DIR NOTFOUND CACHE PATH 
     53#  "The path to toplevel directory of your Jace checkout") 
     54#if(IS_DIRECTORY "${JACE_DIR}") 
     55#  message(STATUS "jace root     : ${JACE_DIR}") 
     56#else(IS_DIRECTORY "${JACE_DIR}") 
     57#  message(FATAL_ERROR "Cannot build without Jace. Please set JACE_DIR.") 
     58#endif(IS_DIRECTORY "${JACE_DIR}") 
    5959 
    6060### build Bio-Formats C++ bindings ### 
    6161 
    6262include_directories(include 
    63   "proxies/include" "${JACE_DIR}/core/cpp/include" 
     63  "proxies/include" "${JACE_CPP_DIR}/include" 
    6464  "${JAVA_INCLUDE_PATH}" "${JAVA_INCLUDE_PATH2}" "${Boost_INCLUDE_DIR}") 
    6565 
  • trunk/components/native/bf-cpp/build.properties

    r6386 r6643  
    3030              ${artifact.dir}/flow-cytometry.jar 
    3131 
     32jace-java.dir = ${jace.home}/source/java 
     33# For Jace r46 and later, use instead (& see jace/Prerequisites.cmake): 
     34#jace-java.dir = ${jace.home}/core/java 
     35 
    3236# Override of you are running a different version of Visual Studio on Windows. 
    3337# As of this writing, generators for Visual Studio include: 
  • trunk/components/native/bf-cpp/build.xml

    r6641 r6643  
    6464      </then> 
    6565      <else> 
    66         <ant dir="${jace.home}/core/java"/> 
     66        <ant dir="${jace-java.dir}"/> 
    6767      </else> 
    6868    </if> 
     
    210210  <target name="clean-jace" depends="check-jace" 
    211211    description="remove Jace build files and libraries"> 
    212     <ant dir="${jace.home}/core/java" target="clean"/> 
     212    <ant dir="${jace-java.dir}" target="clean"/> 
    213213    <delete file="${jace.home}/release/lib/jace.jar"/> 
    214214    <delete file="${jace.home}/release/lib/jace-runtime.jar"/> 
  • trunk/components/native/bf-cpp/jace/CMakeLists.txt

    r6641 r6643  
    3434### build Jace C++ library ### 
    3535 
    36 message(STATUS "-- Jace:") 
    37 set(JACE_DIR NOTFOUND CACHE PATH "The path to toplevel directory of your Jace checkout") 
    38 if(IS_DIRECTORY "${JACE_DIR}") 
    39   message(STATUS "jace root     : ${JACE_DIR}") 
    40 else(IS_DIRECTORY "${JACE_DIR}") 
    41   message(FATAL_ERROR "Cannot build without Jace. Please set JACE_DIR.") 
    42 endif(IS_DIRECTORY "${JACE_DIR}") 
     36#message(STATUS "-- Jace:") 
     37#set(JACE_DIR NOTFOUND CACHE PATH 
     38#  "The path to toplevel directory of your Jace checkout") 
     39#if(IS_DIRECTORY "${JACE_DIR}") 
     40#  message(STATUS "jace root     : ${JACE_DIR}") 
     41#else(IS_DIRECTORY "${JACE_DIR}") 
     42#  message(FATAL_ERROR "Cannot build without Jace. Please set JACE_DIR.") 
     43#endif(IS_DIRECTORY "${JACE_DIR}") 
    4344 
    44 include_directories("${JACE_DIR}/core/cpp/include" 
     45include_directories("${JACE_CPP_DIR}/include" 
    4546  "${JAVA_INCLUDE_PATH}" "${JAVA_INCLUDE_PATH2}" 
    4647  "${Boost_INCLUDE_DIR}") 
    4748 
    48 file(GLOB_RECURSE JACE_SRC "${JACE_DIR}/core/cpp/source/*.cpp") 
     49file(GLOB_RECURSE JACE_SRC "${JACE_CPP_DIR}/source/*.cpp") 
    4950#message("jace source   : ${JACE_SRC}") 
    5051message(STATUS "") 
  • trunk/components/native/bf-cpp/jace/Prerequisites.cmake

    r5698 r6643  
    8787  link_directories(${Boost_STRIPPED_LIB_DIR}) 
    8888endif(WIN32) 
     89 
     90message(STATUS "-- Jace:") 
     91set(JACE_DIR NOTFOUND CACHE PATH 
     92  "The path to toplevel directory of your Jace checkout") 
     93if(IS_DIRECTORY "${JACE_DIR}") 
     94  message(STATUS "jace root     : ${JACE_DIR}") 
     95else(IS_DIRECTORY "${JACE_DIR}") 
     96  message(FATAL_ERROR "Cannot build without Jace. Please set JACE_DIR.") 
     97endif(IS_DIRECTORY "${JACE_DIR}") 
     98 
     99set(JACE_CPP_DIR "${JACE_DIR}/source/c++") 
     100# For Jace r46 and later, use instead (& see build.properties): 
     101#set(JACE_CPP_DIR "${JACE_DIR}/core/cpp") 
     102 
  • trunk/components/native/bf-cpp/readme.txt

    r5987 r6643  
    8484Regardless of your platform, you will need to check out the Jace source code: 
    8585 
    86   svn co https://jace.svn.sourceforge.net/svnroot/jace/trunk /path/to/jace 
     86  svn co -r 39 https://jace.svn.sourceforge.net/svnroot/jace/trunk /path/to/jace 
    8787 
    8888Where /path/to/jace is the desired location of your Jace source code checkout. 
     89The "-r 39" matters, since Jace revisions 40 and later may not work with bf-cpp. 
    8990 
    90 As of this writing, the most recent revision was 23, and it was known to work. 
    91 Revisions prior to 23 had problems preventing them from working properly with 
    92 the bf-cpp package. 
     91As of this writing, the most recent revision was 52, and it does not compile 
     92on some systems. We currently recommend revision 39. 
     93 
     94If you attempt to use revision 46 or later, the Jace directory structure 
     95is different, and you will need to edit two paths: 
     96  1. jace-java.dir in build.properties 
     97  2. JACE_CPP_DIR in jace/Prerequisites.cmake 
    9398 
    9499The above command assumes you have the svn command line tool for Subversion 
Note: See TracChangeset for help on using the changeset viewer.