[jboss-svn-commits] JBL Code SVN: r11342 - labs/jbossrules/trunk/drools-eclipse.

[jboss-svn-commits at lists.jboss.org]

Author: mark.proctor at jboss.com
Date: 2007-04-25 22:17:04 -0400 (Wed, 25 Apr 2007)
New Revision: 11342

Modified:
   labs/jbossrules/trunk/drools-eclipse/pom.xml
   labs/jbossrules/trunk/drools-eclipse/setupEclipse.xml
Log:
-fixed local eclipse drop directory

Modified: labs/jbossrules/trunk/drools-eclipse/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/pom.xml	2007-04-26 01:52:44 UTC (rev 11341)
+++ labs/jbossrules/trunk/drools-eclipse/pom.xml	2007-04-26 02:17:04 UTC (rev 11342)
@@ -40,21 +40,18 @@
              <tasks>                              
                 <property name="eclipse.home" value="target/eclipse" />             
                 
-                <property name="localEclipseDrop" value="${basedir}/local-eclipse-drop-mirror" />      
-              
-                <property name="eclipse.home" value="target/eclipse" />             
-                
                 <property name="localEclipseDrop" value="${basedir}/local-eclipse-drop-mirror" />                
-                
                 <delete  dir="target/eclipse.build" />
                 
-                <ant target="setupLocalEclipse" antfile="setupEclipse.xml" />
+                <ant target="setupLocalEclipse" antfile="setupEclipse.xml">
+                  <property name="localEclipseDrop" value="${localEclipseDrop}" />
+                </ant>
                  
                 <java jar="${eclipse.home}/startup.jar"
                       fork="true"
                       failonerror="true"
                       maxmemory="128m">
-                     <arg line="-application org.eclipse.ant.core.antRunner -DlocalEclipseDrop='${localEclipseDrop}' -DmavenCompilePhase=true"/>
+                     <arg line="-application org.eclipse.ant.core.antRunner -DmavenCompilePhase=true"/>
                 </java>                 
              </tasks>
            </configuration>
@@ -136,16 +133,15 @@
                    <contains string="${os.name}" substring="sparc" />
                </condition>        
               
-                <property name="eclipse.home" value="target/eclipse" />             
-                <property name="localEclipseDrop" value="${basedir}/local-eclipse-drop-mirror" />
+                <property name="eclipse.home" value="target/eclipse" />                             
                 
-                <echo>-application org.eclipse.ant.core.antRunner -Dbaseos=${baseos} -Dbasews=${basews} -Dbasearch=${basearch} -DlocalEclipseDrop='${localEclipseDrop}' -DrunTests=true -DmavenTestPhase=true</echo>
+                <echo>-application org.eclipse.ant.core.antRunner -Dbaseos=${baseos} -Dbasews=${basews} -Dbasearch=${basearch} -DrunTests=true -DmavenTestPhase=true</echo>
                  
                 <java jar="${eclipse.home}/startup.jar"
                       fork="true"
                       failonerror="true"
                       maxmemory="128m">
-                     <arg line="-application org.eclipse.ant.core.antRunner -Dbaseos=${baseos} -Dbasews=${basews} -Dbasearch=${basearch} -DlocalEclipseDrop='${localEclipseDrop}' -DrunTests=true -DmavenTestPhase=true"/>
+                     <arg line="-application org.eclipse.ant.core.antRunner -Dbaseos=${baseos} -Dbasews=${basews} -Dbasearch=${basearch} -DrunTests=true -DmavenTestPhase=true"/>
                 </java>                 
              </tasks>
            </configuration>

Modified: labs/jbossrules/trunk/drools-eclipse/setupEclipse.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/setupEclipse.xml	2007-04-26 01:52:44 UTC (rev 11341)
+++ labs/jbossrules/trunk/drools-eclipse/setupEclipse.xml	2007-04-26 02:17:04 UTC (rev 11342)
@@ -2,7 +2,7 @@
   
   <property file="build.properties"/>
 
-  <property name="localEclipseDrop" value="${basedir}/local-eclipse-drop-mirror" />  
+  <property name="localEclipseDrop" value="${basedir}/local-eclipse-drop-mirror" />   
  
   <!-- set the OS name, make sure each condition is mutally exclusive -->
 	<condition property="download.type" value="win32">
@@ -113,6 +113,7 @@
   </target>
     
   <target name="setupLocalEclipse" depends="checkLocalEclipse" unless="skipSetupLocalEcipse">  
+    <echo>local eclipse drop mirror - ${localEclipseDrop}</echo>
     <antcall target="setupLocalEclipseDrop" />
     <antcall target="expandEclipseJars" />
   </target>