svn commit: r280594 - in /geronimo/devtools/trunk/modules/eclipse-plugin: maven.xml org.apache.geronimo.ui/project.properties org.apache.geronimo.ui/project.xml

[sp...@apache.org]

Author: sppatel
Date: Tue Sep 13 10:09:57 2005
New Revision: 280594

URL: http://svn.apache.org/viewcvs?rev=280594&view=rev
Log:
Fix to build on win32, mac, and gtk.linux

Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.properties
    geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.xml

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml?rev=280594&r1=280593&r2=280594&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml Tue Sep 13 10:09:57 2005
@@ -2,8 +2,8 @@
 <project default="default"
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant">
-
-    <goal name="default">
+    
+    <goal name="default" prereqs="init">    
         <j:set var="maven.multiproject.excludes" value="etc/project.xml"/>
         <j:set var="goal" value="jar:install"/>
         <attainGoal name="multiproject:goal"/>
@@ -18,9 +18,22 @@
         <attainGoal name="multiproject:goal"/>
     </goal>
 
-    <goal name="rebuild">
+    <goal name="rebuild">       
         <attainGoal name="clean"/>
         <attainGoal name="build"/>
+    </goal>
+    
+    <goal name="init">
+       <j:set var="os" value="${os.name}"/>
+       <j:if test="${os.startsWith('Windows')}">
+          ${systemScope.setProperty('swt.fragmentid','win32.win32.x86')}
+       </j:if>
+       <j:if test="${os.startsWith('Mac')}">
+          ${systemScope.setProperty('swt.fragmentid','carbon.macosx.ppc')} 
+       </j:if>
+       <j:if test="${os.startsWith('Linux')}">
+          ${systemScope.setProperty('swt.fragmentid','gtk.linux.x86')} 
+       </j:if>          
     </goal>
      
 </project>

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.properties?rev=280594&r1=280593&r2=280594&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.properties (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.properties Tue Sep 13 10:09:57 2005
@@ -14,10 +14,11 @@
 maven.jar.org.eclipse.ui.workbench.texteditor = ${eclipse.home.plugins}/org.eclipse.ui.workbench.texteditor_3.1.0.jar
 maven.jar.org.eclipse.wst.server.core = ${eclipse.home.plugins}/org.eclipse.wst.server.core_0.7.0.jar
 maven.jar.org.eclipse.wst.server.ui = ${eclipse.home.plugins}/org.eclipse.wst.server.ui_0.7.0.jar
-maven.jar.org.eclipse.swt.win32 = ${eclipse.home.plugins}/org.eclipse.swt.win32.win32.x86_3.1.0.jar
 maven.jar.org.eclipse.jface = ${eclipse.home.plugins}/org.eclipse.jface_3.1.0.jar
 maven.jar.org.eclipse.core.commands = ${eclipse.home.plugins}/org.eclipse.core.commands_3.1.0.jar 
 
 maven.jar.org.eclipse.jst.server.generic.core = ${eclipse.home.plugins}/org.eclipse.jst.server.generic.core_0.7.0/genericserver.jar
 maven.jar.org.eclipse.jst.server.generic.ui = ${eclipse.home.plugins}/org.eclipse.jst.server.generic.ui_0.7.0/genericui.jar
-maven.jar.org.eclipse.wst.common.modulecore = ${eclipse.home.plugins}/org.eclipse.wst.common.modulecore_0.7.0/modulecore.jar
\ No newline at end of file
+maven.jar.org.eclipse.wst.common.modulecore = ${eclipse.home.plugins}/org.eclipse.wst.common.modulecore_0.7.0/modulecore.jar
+
+maven.jar.org.eclipse.swt.fragment = ${eclipse.home.plugins}/org.eclipse.swt.${swt.fragmentid}_3.1.0.jar
\ No newline at end of file

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.xml?rev=280594&r1=280593&r2=280594&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/org.apache.geronimo.ui/project.xml Tue Sep 13 10:09:57 2005
@@ -42,7 +42,7 @@
     </dependency>
     <dependency>
       <groupId>eclipse</groupId>
-      <artifactId>org.eclipse.swt.win32</artifactId>
+      <artifactId>org.eclipse.swt.fragment</artifactId>
       <version>3.1.0</version>
     </dependency>
     <dependency>