incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r512118 - in /incubator/nmaven/branches/SI_IDE: ./ assemblies/ assemblies/NMaven.Plugin.Resx/src/main/config/ assemblies/NMaven.Plugin.Solution/
Date Tue, 27 Feb 2007 02:40:52 GMT
Author: sisbell
Date: Mon Feb 26 18:40:51 2007
New Revision: 512118

URL: http://svn.apache.org/viewvc?view=rev&rev=512118
Log:
Build now works with a -DwithIde option, using a profile within the pom. Adding this option
will compile the .NET assemblies used for generating csproj files. This requires MS/Windows/.NET
2.0, so we need a profile so that the bootstrap build does not break for everyone else.

Added:
    incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config
  (with props)
Removed:
    incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/resx.exe.config
Modified:
    incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml
    incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml
    incubator/nmaven/branches/SI_IDE/assemblies/pom.xml
    incubator/nmaven/branches/SI_IDE/bootstrap-build.bat

Added: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config?view=auto&rev=512118
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config
(added)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config
Mon Feb 26 18:40:51 2007
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <appSettings>
+        <add key="abs" value="audio/x-mpeg"/>
+        <add key="ai" value="application/postscript"/>
+        <add key="aif" value="audio/x-aiff"/>
+        <add key="aifc" value="audio/x-aiff"/>
+        <add key="aiff" value="audio/x-aiff"/>
+        <add key="aim" value="application/x-aim"/>
+        <add key="art" value="image/x-jg"/>
+        <add key="asf" value="video/x-ms-asf"/>
+        <add key="asx" value="video/x-ms-asf "/>
+        <add key="au" value="audio/basic"/>
+        <add key="avi" value="video/x-msvideo"/>
+        <add key="avx" value="video/x-rad-screenplay"/>
+        <add key="bcpio" value="application/x-bcpio"/>
+        <add key="bin" value="application/octet-stream"/>
+        <add key="bmp" value="image/bmp"/>
+        <add key="body" value="text/html"/>
+        <add key="cdf" value="application/x-cdf"/>
+        <add key="cer" value="application/x-x509-ca-cert"/>
+        <add key="class" value="application/java"/>
+        <add key="cpio" value="application/x-cpio"/>
+        <add key="csh" value="application/x-csh"/>
+        <add key="css" value="text/css"/>
+        <add key="dib" value="image/bmp"/>
+        <add key="doc" value="application/msword"/>
+        <add key="dtd" value="text/plain"/>
+        <add key="dv" value="video/x-dv"/>
+        <add key="dvi" value="application/x-dvi"/>
+        <add key="eps" value="application/postscript"/>
+        <add key="etx" value="text/x-setext"/>
+        <add key="exe" value="application/octet-stream"/>
+        <add key="gif" value="image/gif"/>
+        <add key="gtar" value="application/x-gtar"/>
+        <add key="gz" value="application/x-gzip"/>
+        <add key="hdf" value="application/x-hdf"/>
+        <add key="htc" value="text/x-component"/>
+        <add key="htm" value="text/html"/>
+        <add key="html" value="text/html"/>
+        <add key="hqx" value="application/mac-binhex40"/>
+        <add key="ico" value="image/ico"/>	        
+        <add key="ief" value="image/ief"/>
+        <add key="jad" value="text/vnd.sun.j2me.app-descriptor"/>
+        <add key="jar" value="application/java-archive"/>
+        <add key="java" value="text/plain"/>
+        <add key="jnlp" value="application/x-java-jnlp-file"/>
+        <add key="jpe" value="image/jpeg"/>
+        <add key="jpeg" value="image/jpeg"/>
+        <add key="jpg" value="image/jpeg"/>
+        <add key="js" value="text/javascript"/>
+        <add key="jsf" value="text/plain"/>
+        <add key="jspf" value="text/plain"/>
+        <add key="kar" value="audio/midi"/>
+        <add key="latex" value="application/x-latex"/>
+        <add key="m3u" value="audio/x-mpegurl"/>
+        <add key="mac" value="image/x-macpaint"/>
+        <add key="man" value="application/x-troff-man"/>
+        <add key="me" value="application/x-troff-me"/>
+        <add key="mid" value="audio/midi"/>
+        <add key="midi" value="audio/midi"/>
+        <add key="mif" value="application/x-mif"/>
+        <add key="mms" value="application/vnd.wap.mms-message"/>
+        <add key="mov" value="video/quicktime"/>
+        <add key="movie" value="video/x-sgi-movie"/>
+        <add key="mp1" value="audio/x-mpeg"/>
+        <add key="mp2" value="audio/x-mpeg"/>
+        <add key="mp3" value="audio/x-mpeg"/>
+        <add key="mpa" value="audio/x-mpeg"/>
+        <add key="mpe" value="video/mpeg"/>
+        <add key="mpeg" value="video/mpeg"/>
+        <add key="mpega" value="audio/x-mpeg"/>
+        <add key="mpg" value="video/mpeg"/>
+        <add key="mpv2" value="video/mpeg2"/>
+        <add key="ms" value="application/x-wais-source"/>
+        <add key="nc" value="application/x-netcdf"/>
+        <add key="oda" value="application/oda"/>
+        <add key="par" value="application/x-jvending-par-archive"/>
+        <add key="pbm" value="image/x-portable-bitmap"/>
+        <add key="pct" value="image/pict"/>
+        <add key="pdf" value="application/pdf"/>
+        <add key="pgm" value="image/x-portable-graymap"/>
+        <add key="pic" value="image/pict"/>
+        <add key="pict" value="image/pict"/>
+        <add key="pls" value="audio/x-scpls"/>
+        <add key="png" value="image/png"/>
+        <add key="pnm" value="image/x-portable-anymap"/>
+        <add key="pnt" value="image/x-macpaint"/>
+        <add key="ppm" value="image/x-portable-pixmap"/>
+        <add key="ppt" value="application/powerpoint"/>
+        <add key="ps" value="application/postscript"/>
+        <add key="psd" value="image/x-photoshop"/>
+        <add key="qt" value="video/quicktime"/>
+        <add key="qti" value="image/x-quicktime"/>
+        <add key="qtif" value="image/x-quicktime"/>
+        <add key="ra" value="application/x-pn-realaudio"/>
+        <add key="ram" value="application/x-pn-realaudio"/>
+        <add key="ras" value="image/x-cmu-raster"/>
+        <add key="rgb" value="image/x-rgb"/>
+        <add key="rm" value="application/vnd.rn-realmedia"/>
+        <add key="roff" value="application/x-troff"/>
+        <add key="rtf" value="application/rtf"/>
+        <add key="rtx" value="text/richtext"/>
+        <add key="sh" value="application/x-sh"/>
+        <add key="shar" value="application/x-shar"/>
+        <add key="smf" value="audio/x-midi"/>
+        <add key="sit" value="application/x-stuffit"/>
+        <add key="snd" value="audio/basic"/>
+        <add key="src" value="application/x-wais-source"/>
+        <add key="sv4cpio" value="application/x-sv4cpio"/>
+        <add key="sv4crc" value="application/x-sv4crc"/>
+        <add key="swf" value="application/x-shockwave-flash"/>
+        <add key="t" value="application/x-troff"/>
+        <add key="tar" value="application/x-tar"/>
+        <add key="tcl" value="application/x-tcl"/>
+        <add key="tex" value="application/x-tex"/>
+        <add key="texi" value="application/x-texinfo"/>
+        <add key="texinfo" value="application/x-texinfo"/>
+        <add key="tif" value="image/tiff"/>
+        <add key="tiff" value="image/tiff"/>
+        <add key="torrent" value="application/x-bittorrent"/>
+        <add key="tr" value="application/x-troff"/>
+        <add key="tsv" value="text/tab-separated-values"/>
+        <add key="txt" value="text/plain"/>
+        <add key="ulw" value="audio/basic"/>
+        <add key="ustar" value="application/x-ustar"/>
+        <add key="wma" value="audio/x-ms-wma"/>
+        <add key="xbm" value="image/x-xbitmap"/>
+        <add key="xht" value="application/xhtml"/>
+        <add key="xhtml" value="application/xhtml"/>
+        <add key="xml" value="text/xml"/>
+        <add key="xpm" value="image/x-xpixmap"/>
+        <add key="x-properties" value="text/plain"/>        
+        <add key="xsl" value="text/xml"/>
+        <add key="xwd" value="image/x-xwindowdump"/>
+        <add key="wav" value="audio/x-wav"/>
+        <add key="svg" value="image/svg"/>
+        <add key="svgz" value="image/svg"/>
+        <add key="vsd" value="application/x-visio"/>
+        <add key="wbmp" value="image/vnd.wap.wbmp"/>
+        <add key="wml" value="text/vnd.wap.wml"/>
+        <add key="wmlc" value="application/vnd.wap.wmlc"/>
+        <add key="wmls" value="text/vnd.wap.wmlscript"/>
+        <add key="wmlscriptc" value="application/vnd.wap.wmlscriptc"/>
+        <add key="wrl" value="x-world/x-vrml"/>
+        <add key="Z" value="application/x-compress"/>
+        <add key="z" value="application/x-compress"/>
+        <add key="zip" value="application/zip"/> 
+    </appSettings>
+</configuration>

Propchange: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml?view=diff&rev=512118&r1=512117&r2=512118
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml Mon Feb 26
18:40:51 2007
@@ -1,40 +1,39 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>NMaven.Plugin</groupId>
-    <artifactId>NMaven.Plugin.Solution</artifactId>
-    <packaging>exe</packaging>
-    <version>0.14</version>
-    <name>NMaven.Plugin.Solution</name>
-    <dependencies>
-        <dependency>
-            <groupId>org.nunit</groupId>
-            <artifactId>nunit.framework</artifactId>
-            <version>2.2.8.0</version>
-            <type>library</type>
-        </dependency>
-        <dependency>
-            <groupId>NMaven.Core</groupId>
-            <artifactId>NMaven.Core</artifactId>
-            <version>0.14</version>
-            <type>module</type>
-        </dependency>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>NMaven.Plugin</groupId>
+  <artifactId>NMaven.Plugin.Solution</artifactId>
+  <packaging>exe</packaging>
+  <version>0.14</version>
+  <name>NMaven.Plugin.Solution</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.nunit</groupId>
+      <artifactId>nunit.framework</artifactId>
+      <version>2.2.8.0</version>
+      <type>library</type>
+    </dependency>
+    <dependency>
+      <groupId>NMaven.Core</groupId>
+      <artifactId>NMaven.Core</artifactId>
+      <version>0.14</version>
+      <type>module</type>
+    </dependency>
     <dependency>
       <groupId>NMaven.Model</groupId>
       <artifactId>NMaven.Model.Pom</artifactId>
       <type>module</type>
       <version>0.14</version>
     </dependency>
-
-    </dependencies>
-    <build>
-        <sourceDirectory>src/main/csharp</sourceDirectory>
-        <testSourceDirectory>src/test/csharp</testSourceDirectory>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.dotnet.plugins</groupId>
-                <artifactId>maven-compile-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>            
-        </plugins>
-    </build>
+  </dependencies>
+  <build>
+    <sourceDirectory>src/main/csharp</sourceDirectory>
+    <testSourceDirectory>src/test/csharp</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.dotnet.plugins</groupId>
+        <artifactId>maven-compile-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Modified: incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml?view=diff&rev=512118&r1=512117&r2=512118
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml Mon Feb 26 18:40:51
2007
@@ -1,30 +1,46 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.maven.dotnet.plugins</groupId>
-    <artifactId>maven-dotnet-plugins</artifactId>
-    <packaging>pom</packaging>
-    <version>0.14-SNAPSHOT</version>
-    <name>maven-dotnet-plugins</name>
-    <modules>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.dotnet.plugins</groupId>
+  <artifactId>maven-dotnet-plugins</artifactId>
+  <packaging>pom</packaging>
+  <version>0.14-SNAPSHOT</version>
+  <name>maven-dotnet-plugins</name>
+  <modules>
+    <module>NMaven.Plugin.Resx</module>
+    <module>NMaven.Plugin.Settings</module>
+  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>dotnet-assembler</artifactId>
+      <version>0.14-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>dotnet-executable</artifactId>
+      <version>0.14-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>dotnet-artifact</artifactId>
+      <version>0.14-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+  <profiles>
+    <profile>
+      <activation>
+        <property>
+          <name>withIde</name>
+        </property>
+      </activation>
+      <modules>
+        <module>NMaven.Core</module>
+        <module>NMaven.Model/Pom</module>
         <module>NMaven.Plugin.Resx</module>
         <module>NMaven.Plugin.Settings</module>
-    </modules>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven.dotnet</groupId>
-            <artifactId>dotnet-assembler</artifactId>
-            <version>0.14-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.dotnet</groupId>
-            <artifactId>dotnet-executable</artifactId>
-            <version>0.14-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.dotnet</groupId>
-            <artifactId>dotnet-artifact</artifactId>
-            <version>0.14-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
+        <module>NMaven.Plugin.Solution</module>
+      </modules>
+    </profile>
+  </profiles>
 </project>

Modified: incubator/nmaven/branches/SI_IDE/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/pom.xml?view=diff&rev=512118&r1=512117&r2=512118
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/pom.xml Mon Feb 26 18:40:51 2007
@@ -117,13 +117,10 @@
     </developer>
   </developers>
   <modules>
-    <module>NMaven.Core</module>
-    <module>NMaven.Model/Pom</module>
     <module>NMaven.Plugin.Resx</module>
     <module>NMaven.Plugin.Settings</module>
-    <module>NMaven.Plugin.Solution</module>      
   </modules>
-   <build>
+  <build>
     <sourceDirectory>src/main/csharp</sourceDirectory>
     <testSourceDirectory>src/test/csharp</testSourceDirectory>
 
@@ -136,4 +133,20 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <activation>
+        <property>
+          <name>withIde</name>
+        </property>
+      </activation>
+      <modules>
+        <module>NMaven.Core</module>
+        <module>NMaven.Model/Pom</module>
+        <module>NMaven.Plugin.Resx</module>
+        <module>NMaven.Plugin.Settings</module>
+        <module>NMaven.Plugin.Solution</module>
+      </modules>
+    </profile>
+  </profiles>
 </project>

Modified: incubator/nmaven/branches/SI_IDE/bootstrap-build.bat
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/bootstrap-build.bat?view=diff&rev=512118&r1=512117&r2=512118
==============================================================================
--- incubator/nmaven/branches/SI_IDE/bootstrap-build.bat (original)
+++ incubator/nmaven/branches/SI_IDE/bootstrap-build.bat Mon Feb 26 18:40:51 2007
@@ -1,4 +1,4 @@
 call mvn -f ./components/pom.xml install
 call mvn -f ./plugins/pom-java-bootstrap.xml install
 call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file -Dfile=./plugins/imports/nunit-2.0/nunit.framework.dll
-DgroupId=org.nunit -DartifactId=nunit.framework -Dpackaging=dll -Dversion=2.2.8.0
-call mvn -f ./assemblies/pom-net-bootstrap.xml -Dmaven.test.skip=true -Dbootstrap install
\ No newline at end of file
+call mvn -f ./assemblies/pom-net-bootstrap.xml -Dmaven.test.skip=true -Dbootstrap install
%*
\ No newline at end of file



Mime
View raw message