Changeset 7557


Ignore:
Timestamp:
01/20/11 12:45:33 (9 years ago)
Author:
hinerm
Message:

Forward port from branch 4.2 changes - mistakenly committed to
a branch instead of the trunk.

Adds a clean-all command to the BF-CPP ant script, a new java class
to generate a text file of BF-supported file extensions, and modifications
to the build files to automatically run this java class and move the
resulting text file to the dist folder.

Location:
trunk/components/native
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/components/native

  • trunk/components/native/bf-cpp/build.properties

    r6670 r7557  
    1010component.jar            = bf-cpp.jar 
    1111component.version        = 1.0.0 
    12 component.classpath      = 
     12component.classpath      = ${artifact.dir}/bio-formats.jar 
    1313component.java-version   = 1.5 
    1414component.deprecation    = true 
     
    1717component.resources-text = conflicts.txt 
    1818 
    19 component.main-class     = FixProxies 
     19component.main-class     = 
    2020component.runtime-cp     = ${component.classpath} 
    2121 
  • trunk/components/native/bf-cpp/build.xml

    r6670 r7557  
    123123        </if> 
    124124        <!-- Escape certain constants to dodge global namespace conflicts. --> 
    125         <java fork="true" classname="${component.main-class}" 
     125        <java fork="true" classname="FixProxies" 
    126126          classpath="${classes.dir}:${component.runtime-cp}"> 
    127127          <arg value="${proxies.dir}"/> 
    128128        </java> 
    129       </else> 
    130     </if> 
     129        <!-- Generate Bio-Formats suffix list to a handy file. --> 
     130        <java fork="true" classname="BioFormatsExtensionPrinter" 
     131          classpath="${classes.dir}:${component.runtime-cp}"/> 
     132      </else> 
     133    </if> 
     134  </target> 
     135 
     136 
     137  <target name="clean-all" depends="clean, clean-proxies" 
     138    description="deletes the bf-cpp build and all generated proxies"> 
    131139  </target> 
    132140 
  • trunk/components/native/bf-itk/build.xml

    r7513 r7557  
    175175    <copy file="${bf-cpp.build}/loci_tools.jar" todir="${bf-itk.dist.dir}"/> 
    176176    <copy file="${bf-cpp.build}/jace-runtime.jar" todir="${bf-itk.dist.dir}"/> 
     177    <copy file="${bf-cpp.build}/BioFormatsSuffixes.txt" todir="${bf-itk.dist.dir}"/> 
    177178 
    178179    <echo/> 
Note: See TracChangeset for help on using the changeset viewer.