Changeset 6165


Ignore:
Timestamp:
04/21/10 15:11:52 (10 years ago)
Author:
curtis
Message:

Fix up Eclipse classpaths:

  • Use build-eclipse instead of build/classes to avoid compile clash with Ant.
  • Include TestNG container link where relevant.
Location:
trunk
Files:
46 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/autogen

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/autogen/.classpath

    r5115 r6165  
    66        <classpathentry combineaccessrules="false" kind="src" path="/common"/> 
    77        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
    8         <classpathentry kind="output" path="build/classes"/> 
     8        <classpathentry kind="output" path="build-eclipse"/> 
    99</classpath> 
  • trunk/components/bf-ice

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/bf-ice/.classpath

    r5479 r6165  
    66        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
    77        <classpathentry combineaccessrules="false" kind="src" path="/common"/> 
    8         <classpathentry kind="output" path="build/classes"/> 
     8        <classpathentry kind="output" path="build-eclipse"/> 
    99</classpath> 
  • trunk/components/bio-formats

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/bio-formats/.classpath

    r6047 r6165  
    44        <classpathentry kind="src" path="test"/> 
    55        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
     6        <classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/> 
    67        <classpathentry combineaccessrules="false" kind="src" path="/common"/> 
    78        <classpathentry combineaccessrules="false" kind="src" path="/jai"/> 
     
    1112        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
    1213        <classpathentry combineaccessrules="false" kind="src" path="/lwf-stubs"/> 
    13         <classpathentry kind="output" path="build/classes"/> 
     14        <classpathentry kind="output" path="build-eclipse"/> 
    1415</classpath> 
  • trunk/components/checkstyle

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/checkstyle/.classpath

    r5115 r6165  
    44        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    55        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
    6         <classpathentry kind="output" path="build/classes"/> 
     6        <classpathentry kind="output" path="build-eclipse"/> 
    77</classpath> 
  • trunk/components/common

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/common/.classpath

    r6045 r6165  
    44        <classpathentry kind="src" path="test"/> 
    55        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
     6        <classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/> 
    67        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
    7         <classpathentry kind="output" path="build/classes"/> 
     8        <classpathentry kind="output" path="build-eclipse"/> 
    89</classpath> 
  • trunk/components/flow-cytometry

    • Property svn:ignore
      •  

        old new  
        11build 
        2 dist 
         2build-eclipse 
  • trunk/components/flow-cytometry/.classpath

    r6045 r6165  
    66        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
    77        <classpathentry combineaccessrules="false" kind="src" path="/common"/> 
    8         <classpathentry kind="output" path="build/classes"/> 
     8        <classpathentry kind="output" path="build-eclipse"/> 
    99</classpath> 
  • trunk/components/forks/jai

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/forks/jai/.classpath

    r5115 r6165  
    44        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    55        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
    6         <classpathentry kind="output" path="build/classes"/> 
     6        <classpathentry kind="output" path="build-eclipse"/> 
    77</classpath> 
  • trunk/components/forks/mdbtools

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/forks/mdbtools/.classpath

    r4472 r6165  
    33        <classpathentry kind="src" path="src"/> 
    44        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    5         <classpathentry kind="output" path="build/classes"/> 
     5        <classpathentry kind="output" path="build-eclipse"/> 
    66</classpath> 
  • trunk/components/forks/poi

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/forks/poi/.classpath

    r5115 r6165  
    55        <classpathentry kind="src" path="/common"/> 
    66        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
    7         <classpathentry kind="output" path="build/classes"/> 
     7        <classpathentry kind="output" path="build-eclipse"/> 
    88</classpath> 
  • trunk/components/legacy/jvmlink

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/legacy/jvmlink/.classpath

    r4609 r6165  
    44        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    55        <classpathentry kind="src" path="/common"/> 
    6         <classpathentry kind="output" path="build/classes"/> 
     6        <classpathentry kind="output" path="build-eclipse"/> 
    77</classpath> 
  • trunk/components/legacy/multi-lut

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/legacy/multi-lut/.classpath

    r5115 r6165  
    44        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    55        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
    6         <classpathentry kind="output" path="build/classes"/> 
     6        <classpathentry kind="output" path="build-eclipse"/> 
    77</classpath> 
  • trunk/components/legacy/ome-editor

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/legacy/ome-editor/.classpath

    r5115 r6165  
    77        <classpathentry combineaccessrules="false" kind="src" path="/common"/> 
    88        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
    9         <classpathentry kind="output" path="build/classes"/> 
     9        <classpathentry kind="output" path="build-eclipse"/> 
    1010</classpath> 
  • trunk/components/legacy/ome-notes

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/legacy/ome-notes/.classpath

    r5115 r6165  
    66        <classpathentry combineaccessrules="false" kind="src" path="/common"/> 
    77        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
    8         <classpathentry kind="output" path="build/classes"/> 
     8        <classpathentry kind="output" path="build-eclipse"/> 
    99</classpath> 
  • trunk/components/loci-plugins

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/loci-plugins/.classpath

    r5115 r6165  
    66        <classpathentry combineaccessrules="false" kind="src" path="/common"/> 
    77        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
    8         <classpathentry kind="output" path="build/classes"/> 
     8        <classpathentry kind="output" path="build-eclipse"/> 
    99</classpath> 
  • trunk/components/ome-io

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/ome-io/.classpath

    r6045 r6165  
    44        <classpathentry kind="src" path="test"/> 
    55        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
     6        <classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/> 
    67        <classpathentry combineaccessrules="false" kind="src" path="/bio-formats"/> 
    78        <classpathentry combineaccessrules="false" kind="src" path="/common"/> 
    89        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
    9         <classpathentry kind="output" path="build/classes"/> 
     10        <classpathentry kind="output" path="build-eclipse"/> 
    1011</classpath> 
  • trunk/components/ome-plugins

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/ome-plugins/.classpath

    r5115 r6165  
    88        <classpathentry kind="src" path="/common"/> 
    99        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
    10         <classpathentry kind="output" path="build/classes"/> 
     10        <classpathentry kind="output" path="build-eclipse"/> 
    1111</classpath> 
  • trunk/components/ome-xml

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/ome-xml/.classpath

    r6143 r6165  
    55        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    66        <classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/> 
    7         <classpathentry kind="output" path="build/classes"/> 
     7        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
     8        <classpathentry kind="output" path="build-eclipse"/> 
    89</classpath> 
  • trunk/components/slim-plotter

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/slim-plotter/.classpath

    r5115 r6165  
    77        <classpathentry kind="src" path="/common"/> 
    88        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
    9         <classpathentry kind="output" path="build/classes"/> 
     9        <classpathentry kind="output" path="build-eclipse"/> 
    1010</classpath> 
  • trunk/components/stubs/lwf-stubs

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/stubs/lwf-stubs/.classpath

    r6045 r6165  
    33        <classpathentry kind="src" path="src"/> 
    44        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    5         <classpathentry kind="output" path="build/classes"/> 
     5        <classpathentry kind="output" path="build-eclipse"/> 
    66</classpath> 
  • trunk/components/test-suite

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/test-suite/.classpath

    r5503 r6165  
    33        <classpathentry kind="src" path="src"/> 
    44        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
     5        <classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/> 
    56        <classpathentry combineaccessrules="false" kind="src" path="/bio-formats"/> 
    67        <classpathentry combineaccessrules="false" kind="src" path="/common"/> 
    78        <classpathentry combineaccessrules="false" kind="src" path="/ome-io"/> 
    89        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
    9         <classpathentry kind="output" path="build/classes"/> 
     10        <classpathentry combineaccessrules="false" kind="src" path="/ome-xml"/> 
     11        <classpathentry kind="output" path="build-eclipse"/> 
    1012</classpath> 
  • trunk/components/test-suite/build.properties

    r6045 r6165  
    1313                           ${artifact.dir}/loci-common.jar:\ 
    1414                           ${artifact.dir}/ome-io.jar:\ 
     15                           ${artifact.dir}/ome-xml.jar:\ 
    1516                           ${lib.dir}/log4j-1.2.15.jar:\ 
    1617                           ${lib.dir}/slf4j-api-1.5.10.jar:\ 
  • trunk/components/visbio

    • Property svn:ignore
      •  

        old new  
        11build 
         2build-eclipse 
  • trunk/components/visbio/.classpath

    r6045 r6165  
    1010        <classpathentry combineaccessrules="false" kind="src" path="/common"/> 
    1111        <classpathentry combineaccessrules="false" kind="src" path="/External libraries"/> 
    12         <classpathentry kind="output" path="build/classes"/> 
     12        <classpathentry kind="output" path="build-eclipse"/> 
    1313</classpath> 
  • trunk/jar/.classpath

    r6047 r6165  
    3030        <classpathentry exported="true" kind="lib" path="visad-lite.jar"/> 
    3131        <classpathentry exported="true" kind="lib" path="xmlrpc-1.2-b1.jar"/> 
    32         <classpathentry kind="output" path="bin"/> 
     32        <classpathentry kind="output" path="build-eclipse"/> 
    3333</classpath> 
  • trunk/scan-deps.pl

    r6052 r6165  
    955955  if (@libDeps > 0) { 
    956956    push(@deps, "/External libraries"); 
    957   } 
    958   push(@deps, "build/classes"); 
     957    foreach my $q (@libDeps) { 
     958      if ($$q{NAME} eq $testng{NAME}) { 
     959        push(@deps, "org.testng.TESTNG_CONTAINER"); 
     960      } 
     961    } 
     962  } 
     963  push(@deps, "build-eclipse"); 
    959964  @deps = sort @deps; 
    960965  @cp = @{$$c{ECLIPSE}}; 
  • trunk/utils/.classpath

    r5606 r6165  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<classpath> 
    3         <classpathentry excluding="mipav/**" kind="src" path=""/> 
     3        <classpathentry kind="src" path=""/> 
    44        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    55        <classpathentry kind="output" path=""/> 
Note: See TracChangeset for help on using the changeset viewer.