[savara-commits] savara SVN: r189 - tools/eclipse/trunk/plugins/eclipse-build.

Author: objectiser Date: 2010-03-07 07:59:22 -0500 (Sun, 07 Mar 2010) New Revision: 189 Modified: tools/eclipse/trunk/plugins/eclipse-build/allElements.xml tools/eclipse/trunk/plugins/eclipse-build/installJBossTools.xml Log: Changed build order. Modified: tools/eclipse/trunk/plugins/eclipse-build/allElements.xml =================================================================== --- tools/eclipse/trunk/plugins/eclipse-build/allElements.xml 2010-03-06 22:43:48 UTC (rev 188) +++ tools/eclipse/trunk/plugins/eclipse-build/allElements.xml 2010-03-07 12:59:22 UTC (rev 189) @@ -14,50 +14,52 @@ <target name="org.scribble.feature" if="mavenCompilePhase"> <ant antfile="${genericTargets}" target="${target}"> <property name="type" value="feature" /> - <property name="id" value="org.jboss.savara.tools.bpel.feature" /> + <property name="id" value="org.scribble.feature" /> </ant> + <ant antfile="${genericTargets}" target="${target}"> <property name="type" value="feature" /> - <property name="id" value="org.jboss.savara.tools.jbossesb.feature" /> + <property name="id" value="org.scribble.conversation.feature" /> </ant> + <ant antfile="${genericTargets}" target="${target}"> + <property name="type" value="feature" /> + <property name="id" value="org.scribble.experimental.feature" /> + </ant> + <!-- <ant antfile="${genericTargets}" target="${target}"> <property name="type" value="feature" /> - <property name="id" value="org.pi4soa.bpmn.feature" /> + <property name="id" value="org.scribble.java.feature" /> </ant> --> + <ant antfile="${genericTargets}" target="${target}"> <property name="type" value="feature" /> - <property name="id" value="org.pi4soa.monitor.feature" /> + <property name="id" value="org.scribble.pi4soa.feature" /> </ant> <ant antfile="${genericTargets}" target="${target}"> <property name="type" value="feature" /> - <property name="id" value="org.scribble.conversation.feature" /> + <property name="id" value="org.scribble.protocol.feature" /> </ant> <ant antfile="${genericTargets}" target="${target}"> <property name="type" value="feature" /> - <property name="id" value="org.scribble.experimental.feature" /> - </ant> + <property name="id" value="org.jboss.savara.tools.bpel.feature" /> + </ant> <ant antfile="${genericTargets}" target="${target}"> <property name="type" value="feature" /> - <property name="id" value="org.scribble.feature" /> + <property name="id" value="org.jboss.savara.tools.jbossesb.feature" /> </ant> - <!-- <ant antfile="${genericTargets}" target="${target}"> <property name="type" value="feature" /> - <property name="id" value="org.scribble.java.feature" /> + <property name="id" value="org.pi4soa.bpmn.feature" /> </ant> --> - <ant antfile="${genericTargets}" target="${target}"> <property name="type" value="feature" /> - <property name="id" value="org.scribble.pi4soa.feature" /> + <property name="id" value="org.pi4soa.monitor.feature" /> </ant> - <ant antfile="${genericTargets}" target="${target}"> - <property name="type" value="feature" /> - <property name="id" value="org.scribble.protocol.feature" /> - </ant> + </target> @@ -68,36 +70,18 @@ <!-- Add one target for each root element and each configuration --> <!-- Replace element.id with the id of the top level element being built --> <!-- ===================================================================== --> - <target name="assemble.org.jboss.savara.tools.bpel.feature"> - <property name="archiveName" value="${org.jboss.savara.tools.bpel.zipFile}"/> + <target name="assemble.org.scribble.feature"> + <property name="archiveName" value="${org.scribble.zipFile}"/> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> </target> - <target name="assemble.org.jboss.savara.tools.jbossesb.feature"> - <property name="archiveName" value="${org.jboss.savara.tools.jbossesb.zipFile}"/> + <target name="assemble.org.scribble.experimental.feature"> + <property name="archiveName" value="${org.scribble.experimental.zipFile}"/> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> </target> - <!-- - <target name="assemble.org.pi4soa.bpmn.feature"> - <property name="archiveName" value="${org.pi4soa.bpmn.zipFile}"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - </target> - --> - <target name="assemble.org.pi4soa.monitor.feature"> - <property name="archiveName" value="${org.pi4soa.monitor.zipFile}"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - </target> <target name="assemble.org.scribble.conversation.feature"> <property name="archiveName" value="${org.scribble.conversation.zipFile}"/> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> </target> - <target name="assemble.org.scribble.experimental.feature"> - <property name="archiveName" value="${org.scribble.experimental.zipFile}"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - </target> - <target name="assemble.org.scribble.feature"> - <property name="archiveName" value="${org.scribble.zipFile}"/> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> - </target> <!-- <target name="assemble.org.scribble.java.feature"> @@ -114,5 +98,24 @@ <property name="archiveName" value="${org.scribble.protocol.zipFile}"/> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> </target> + + <target name="assemble.org.jboss.savara.tools.bpel.feature"> + <property name="archiveName" value="${org.jboss.savara.tools.bpel.zipFile}"/> + <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> + </target> + <target name="assemble.org.jboss.savara.tools.jbossesb.feature"> + <property name="archiveName" value="${org.jboss.savara.tools.jbossesb.zipFile}"/> + <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> + </target> + <!-- + <target name="assemble.org.pi4soa.bpmn.feature"> + <property name="archiveName" value="${org.pi4soa.bpmn.zipFile}"/> + <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> + </target> + --> + <target name="assemble.org.pi4soa.monitor.feature"> + <property name="archiveName" value="${org.pi4soa.monitor.zipFile}"/> + <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> + </target> </project> Modified: tools/eclipse/trunk/plugins/eclipse-build/installJBossTools.xml =================================================================== --- tools/eclipse/trunk/plugins/eclipse-build/installJBossTools.xml 2010-03-06 22:43:48 UTC (rev 188) +++ tools/eclipse/trunk/plugins/eclipse-build/installJBossTools.xml 2010-03-07 12:59:22 UTC (rev 189) @@ -159,7 +159,7 @@ </echo> <mkdir dir="${p2.director.install.path}"/> - <chmod perm="ugo+rwx" file="${p2.director.install.path}/eclipse"/> + <chmod perm="777" file="${p2.director.install.path}/eclipse"/> <exec executable="${p2.director.install.path}/eclipse" failonerror="true" dir="${p2.director.install.path}" timeout="900000" taskname="p2.dir"> <arg line=" -vm ${JAVA_HOME}/bin/java"/> <!-- deprecated application for Eclipse 3.4: org.eclipse.equinox.p2.director.app.application -->