[Nice-commit] eclipse build.xml,1.12,1.13

[Daniel B. <bo...@us...>]

Update of /cvsroot/nice/eclipse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv784

Modified Files:
	build.xml 
Log Message:
Use reverseLoader to make sure the referenced Nice compiler is used to compile
the plugin, not the (possibly older) one installed on the system.

Do not reference eclipse plugin using eclipse version, since there are always
mismatches (e.g. a 2.1.1 plugin in a 2.1.2 build).


Index: build.xml
===================================================================
RCS file: /cvsroot/nice/eclipse/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** build.xml	11 Nov 2003 14:17:06 -0000	1.12
--- build.xml	24 Jun 2004 12:14:47 -0000	1.13
***************
*** 19,23 ****
  <project default="dist" basedir=".">
  
!   <property name="plugin.version" value="0.1.11"/>
  
  
--- 19,23 ----
  <project default="dist" basedir=".">
  
!   <property name="plugin.version" value="0.9.8"/>
  
  
***************
*** 68,72 ****
  	  <taskdef name="nicec"
  	    classname="nice.tools.ant.Nicec"
! 	    classpathref="classpath"/>
    </target>
    
--- 68,72 ----
  	  <taskdef name="nicec"
  	    classname="nice.tools.ant.Nicec"
! 	    classpathref="classpath" reverseLoader="true"/>
    </target>
    
***************
*** 130,135 ****
        jar="${build.dir}/${plugin.jar}">
        <classpath>
!         <pathelement location="${eclipse.home}/plugins/org.eclipse.core.resources_${eclipse.version}/resources.jar"/>
!         <pathelement location="${eclipse.home}/plugins/org.eclipse.ui_${eclipse.version}/ui.jar"/>
          <fileset dir="${eclipse.home}/plugins">
            <include name="org.eclipse.swt*/**/*.jar"/>
--- 130,134 ----
        jar="${build.dir}/${plugin.jar}">
        <classpath>
!         <pathelement location="${eclipse.home}/plugins/"/>
          <fileset dir="${eclipse.home}/plugins">
            <include name="org.eclipse.swt*/**/*.jar"/>
***************
*** 139,147 ****
  	  <include name="org.eclipse.ui.workbench.texteditor*/**/texteditor.jar"/>
  	  <include name="org.eclipse.ui.editors*/**/editors.jar"/>
          </fileset>
-         <pathelement location="${eclipse.home}/plugins/org.eclipse.jface_${eclipse.version}/jface.jar"/>
-         <pathelement location="${eclipse.home}/plugins/org.eclipse.ui.workbench_${eclipse.version}/workbench.jar"/>
-         <pathelement location="${eclipse.home}/plugins/org.eclipse.debug.ui_${eclipse.version}/dtui.jar"/>
-         <pathelement location="${eclipse.home}/plugins/org.eclipse.core.runtime_${eclipse.version}/runtime.jar"/>
        </classpath>
      </nicec>
--- 138,148 ----
  	  <include name="org.eclipse.ui.workbench.texteditor*/**/texteditor.jar"/>
  	  <include name="org.eclipse.ui.editors*/**/editors.jar"/>
+ 	  <include name="org.eclipse.core.resources_*/resources.jar"/>
+ 	  <include name="org.eclipse.ui_*/ui.jar"/>
+ 	  <include name="org.eclipse.core.runtime_*/runtime.jar"/>
+ 	  <include name="org.eclipse.ui.workbench_*/workbench.jar"/>
+ 	  <include name="org.eclipse.jface_*/jface.jar"/>
+ 	  <include name="org.eclipse.debug.ui_*/dtui.jar"/>
          </fileset>
        </classpath>
      </nicec>