[savara-commits] savara SVN: r193 - in tools/eclipse/trunk: docs/gettingstartedguide/src/main/module and 1 other directories.

[do-not-reply at jboss.org]

Author: objectiser
Date: 2010-03-09 17:09:00 -0500 (Tue, 09 Mar 2010)
New Revision: 193

Modified:
   tools/eclipse/trunk/distribution/src/main/assembly/bin.xml
   tools/eclipse/trunk/docs/gettingstartedguide/src/main/module/installation.xml
   tools/eclipse/trunk/plugins/eclipse-build/customTargets.xml
   tools/eclipse/trunk/plugins/eclipse-build/setupEclipse.xml
Log:
Updated to fix dependency issue, expand the zips when building the distribution, and updated the installation guide.

Modified: tools/eclipse/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- tools/eclipse/trunk/distribution/src/main/assembly/bin.xml	2010-03-08 18:58:38 UTC (rev 192)
+++ tools/eclipse/trunk/distribution/src/main/assembly/bin.xml	2010-03-09 22:09:00 UTC (rev 193)
@@ -38,13 +38,13 @@
 			</includes>
         </fileSet>
 
-        <!-- copy Eclipse update site -->
+        <!-- copy Eclipse features and plugins -->
         <fileSet>
-		   <directory>../plugins/eclipse-build/target</directory>
+		   <directory>../plugins/eclipse-build/target/dist</directory>
 		   <outputDirectory>eclipse</outputDirectory>
-			<includes>
+			<!-- includes>
 			  <include>*.zip</include>
-			</includes>
+			</includes -->
 		</fileSet>
 
         <!-- copy samples -->

Modified: tools/eclipse/trunk/docs/gettingstartedguide/src/main/module/installation.xml
===================================================================
--- tools/eclipse/trunk/docs/gettingstartedguide/src/main/module/installation.xml	2010-03-08 18:58:38 UTC (rev 192)
+++ tools/eclipse/trunk/docs/gettingstartedguide/src/main/module/installation.xml	2010-03-09 22:09:00 UTC (rev 193)
@@ -66,14 +66,10 @@
 				<listitem>
 				Install SAVARA Eclipse plugins
 				<para>
-       			Start up your Eclipse environment, and go to the
-       			<emphasis>Help->Install New Software..</emphasis>. Instead of entering a URL,
-       			just press the <emphasis>Add</emphasis> button and then when the dialog
-       			window is displayed, select the <emphasis>Local</emphasis> button. Select
-       			the location of the local update site within the SAVARA Eclipse Tools
-       			distribution: <filename>${SAVARA-Tools}/eclipse</filename>.
-       			Again, as with the previous step, follow the instructions provided
-       			by the Eclipse update manager to complete the installation.
+       			The Eclipse plugins for SAVARA are located in the <emphasis>eclipse</emphasis>
+       			folder of the distribution. Copy the contents of the <emphasis>eclipse</emphasis>
+       			folder (in the <emphasis>features</emphasis> and <emphasis>plugins</emphasis>
+       			sub-folders) into the same sub-folders of your Eclipse installation.
        			
        			<note>
        			<para>

Modified: tools/eclipse/trunk/plugins/eclipse-build/customTargets.xml
===================================================================
--- tools/eclipse/trunk/plugins/eclipse-build/customTargets.xml	2010-03-08 18:58:38 UTC (rev 192)
+++ tools/eclipse/trunk/plugins/eclipse-build/customTargets.xml	2010-03-09 22:09:00 UTC (rev 193)
@@ -279,6 +279,12 @@
                 <include name="*.zip"/>
             </fileset>
         </copy>
+		<mkdir dir="${base}/dist"/>
+		<unzip dest="${base}/dist" overwrite="true">
+			<fileset dir="${buildDirectory}/${buildLabel}">
+				<include name="*.zip" />
+			</fileset>
+		</unzip>
 	</target>
 
 	<!-- ===================================================================== -->

Modified: tools/eclipse/trunk/plugins/eclipse-build/setupEclipse.xml
===================================================================
--- tools/eclipse/trunk/plugins/eclipse-build/setupEclipse.xml	2010-03-08 18:58:38 UTC (rev 192)
+++ tools/eclipse/trunk/plugins/eclipse-build/setupEclipse.xml	2010-03-09 22:09:00 UTC (rev 193)
@@ -90,7 +90,6 @@
 	  </target>      
 
 	<target name="checkEclipseJar">	
-<echo>CHECK ECLIPSE JAR: ${localEclipseDrop} ${env.JAVA_HOME}</echo>		
 		<available file="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.type}.zip" property="skipGetEclipseJar" />
 	</target>