Author: sisbell
Date: Mon Mar 19 20:16:41 2007
New Revision: 520248
URL: http://svn.apache.org/viewvc?view=rev&rev=520248
Log:
Updated NUnit assembly to be compatible with MS, Mono and DotGnu. Simplified
the build further.
Added:
incubator/nmaven/branches/SI_IDE/thirdparty/NUnit/
incubator/nmaven/branches/SI_IDE/thirdparty/NUnit/NUnit.Framework.dll
(with props)
Removed:
incubator/nmaven/branches/SI_IDE/plugins/scripts/
incubator/nmaven/branches/SI_IDE/thirdparty/NUnit-1.1/
incubator/nmaven/branches/SI_IDE/thirdparty/NUnit-2.0/
Modified:
incubator/nmaven/branches/SI_IDE/README.txt
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml
incubator/nmaven/branches/SI_IDE/assemblies/pom.xml
incubator/nmaven/branches/SI_IDE/bootstrap-build.bat
incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0001/pom.xml
incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0002/pom.xml
incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0004/pom.xml
incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0017/pom.xml
incubator/nmaven/branches/SI_IDE/site/src/site/apt/getting-started.apt
Modified: incubator/nmaven/branches/SI_IDE/README.txt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/README.txt?view=diff&rev=520248&r1=520247&r2=520248
==============================================================================
--- incubator/nmaven/branches/SI_IDE/README.txt (original)
+++ incubator/nmaven/branches/SI_IDE/README.txt Mon Mar 19 20:16:41 2007
@@ -1,5 +1,12 @@
Initial Build
-* On the first build, execute the bootstrap-build script. On subsequent
builds, you can just type mvn install from
+* On the first build, for Windows execute
+ bootstrap-build.bat or
+ bootstrap-build.bat -DwithIDE"
+ Or on *nix,
+ bootstrap-build.sh
+
+Note that the -DwithIDE option requires Microsoft 2.0 or higher. If this is a
clean build (meaning that you do not have a ~./m2/nmaven-settings.xml file)
+then you will also need to make sure that you have csc within your path. On
subsequent builds, you can just type mvn install from
the command prompt.
IntelliJ IDEA Setup
Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml?view=diff&rev=520248&r1=520247&r2=520248
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml Mon Mar 19
20:16:41 2007
@@ -1,8 +1,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";>
<parent>
- <groupId>org.apache.maven.dotnet</groupId>
+ <groupId>NMaven</groupId>
<version>0.14</version>
- <artifactId>nmaven-assemblies</artifactId>
+ <artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Core</groupId>
@@ -25,7 +25,7 @@
</dependency>
<dependency>
<groupId>NUnit</groupId>
- <artifactId>Nunit.Framework</artifactId>
+ <artifactId>NUnit.Framework</artifactId>
<version>2.2.8.0</version>
<type>library</type>
</dependency>
Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml?view=diff&rev=520248&r1=520247&r2=520248
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml
(original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml Mon
Mar 19 20:16:41 2007
@@ -1,10 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";>
<parent>
- <groupId>org.apache.maven.dotnet</groupId>
+ <groupId>NMaven</groupId>
<version>0.14</version>
- <artifactId>nmaven-assemblies</artifactId>
+ <artifactId>NMaven.Assemblies</artifactId>
<relativePath>..\..\pom.xml</relativePath>
- </parent>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml?view=diff&rev=520248&r1=520247&r2=520248
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml
(original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml Mon
Mar 19 20:16:41 2007
@@ -1,8 +1,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";>
<parent>
- <groupId>org.apache.maven.dotnet</groupId>
+ <groupId>NMaven.A</groupId>
<version>0.14</version>
- <artifactId>nmaven-assemblies</artifactId>
+ <artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Plugin</groupId>
Modified:
incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml?view=diff&rev=520248&r1=520247&r2=520248
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml
(original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml
Mon Mar 19 20:16:41 2007
@@ -1,8 +1,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";>
<parent>
- <groupId>org.apache.maven.dotnet</groupId>
+ <groupId>NMaven.A</groupId>
<version>0.14</version>
- <artifactId>nmaven-assemblies</artifactId>
+ <artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Plugin</groupId>
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=520248&r1=520247&r2=520248
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml
(original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml
Mon Mar 19 20:16:41 2007
@@ -1,8 +1,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";>
<parent>
- <groupId>org.apache.maven.dotnet</groupId>
+ <groupId>NMaven</groupId>
<version>0.14</version>
- <artifactId>nmaven-assemblies</artifactId>
+ <artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Plugin</groupId>
@@ -13,7 +13,7 @@
<dependencies>
<dependency>
<groupId>NUnit</groupId>
- <artifactId>Nunit.Framework</artifactId>
+ <artifactId>NUnit.Framework</artifactId>
<version>2.2.8.0</version>
<type>library</type>
</dependency>
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=520248&r1=520247&r2=520248
==============================================================================
--- incubator/nmaven/branches/SI_IDE/assemblies/pom.xml (original)
+++ incubator/nmaven/branches/SI_IDE/assemblies/pom.xml Mon Mar 19 20:16:41 2007
@@ -1,11 +1,11 @@
<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</groupId>
- <artifactId>nmaven-assemblies</artifactId>
+ <groupId>NMaven.A</groupId>
+ <artifactId>NMaven.Assemblies</artifactId>
<packaging>pom</packaging>
<version>0.14</version>
- <name>nmaven-assemblies</name>
+ <name>NMaven.Assemblies</name>
<url>http://incubator.apache.org/nmaven</url>
<description>
NMaven provides Maven 2.x plugins to support building of .NET applications
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=520248&r1=520247&r2=520248
==============================================================================
--- incubator/nmaven/branches/SI_IDE/bootstrap-build.bat (original)
+++ incubator/nmaven/branches/SI_IDE/bootstrap-build.bat Mon Mar 19 20:16:41
2007
@@ -1,5 +1,5 @@
call mvn -f ./components/pom.xml install
call mvn -f ./plugins/pom.xml install
-call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file
-Dfile=./thirdparty/NUnit-2.0/nunit.framework.dll -DgroupId=NUnit
-DartifactId=NUnit.Framework -Dpackaging=dll -Dversion=2.2.8.0
+call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file
-Dfile=./thirdparty/NUnit/NUnit.Framework.dll -DgroupId=NUnit
-DartifactId=NUnit.Framework -Dpackaging=dll -Dversion=2.2.8.0
call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap install %*
rem call mvn org.apache.maven.dotnet.plugins:maven-solution-plugin:solution
Modified:
incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0001/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0001/pom.xml?view=diff&rev=520248&r1=520247&r2=520248
==============================================================================
--- incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0001/pom.xml
(original)
+++ incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0001/pom.xml Mon
Mar 19 20:16:41 2007
@@ -1,19 +1,18 @@
<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.it</groupId>
- <artifactId>it0001</artifactId>
- <packaging>module</packaging>
- <version>1.0.0</version>
- <name>it0001</name>
-
- <build>
- <sourceDirectory>src/main/csharp</sourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.dotnet.plugins</groupId>
- <artifactId>maven-compile-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.it</groupId>
+ <artifactId>it0001</artifactId>
+ <packaging>module</packaging>
+ <version>1.0.0</version>
+ <name>it0001</name>
+ <build>
+ <sourceDirectory>src/main/csharp</sourceDirectory>
+ <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/integration-tests/tests/it0002/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0002/pom.xml?view=diff&rev=520248&r1=520247&r2=520248
==============================================================================
--- incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0002/pom.xml
(original)
+++ incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0002/pom.xml Mon
Mar 19 20:16:41 2007
@@ -1,27 +1,26 @@
<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.it</groupId>
- <artifactId>it0002</artifactId>
- <packaging>library</packaging>
- <version>1.0.0</version>
- <name>it0002</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.it</groupId>
- <artifactId>it0001</artifactId>
- <type>module</type>
- <version>1.0.0</version>
- </dependency>
- </dependencies>
- <build>
- <sourceDirectory>src/main/csharp</sourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.dotnet.plugins</groupId>
- <artifactId>maven-compile-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.it</groupId>
+ <artifactId>it0002</artifactId>
+ <packaging>library</packaging>
+ <version>1.0.0</version>
+ <name>it0002</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.it</groupId>
+ <artifactId>it0001</artifactId>
+ <type>module</type>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory>src/main/csharp</sourceDirectory>
+ <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/integration-tests/tests/it0004/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0004/pom.xml?view=diff&rev=520248&r1=520247&r2=520248
==============================================================================
--- incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0004/pom.xml
(original)
+++ incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0004/pom.xml Mon
Mar 19 20:16:41 2007
@@ -14,7 +14,7 @@
</dependency>
<dependency>
<groupId>NUnit</groupId>
- <artifactId>Nunit.Framework</artifactId>
+ <artifactId>NUnit.Framework</artifactId>
<version>2.2.8.0</version>
<type>library</type>
</dependency>
Modified:
incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0017/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0017/pom.xml?view=diff&rev=520248&r1=520247&r2=520248
==============================================================================
--- incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0017/pom.xml
(original)
+++ incubator/nmaven/branches/SI_IDE/integration-tests/tests/it0017/pom.xml Mon
Mar 19 20:16:41 2007
@@ -14,7 +14,7 @@
</dependency>
<dependency>
<groupId>NUnit</groupId>
- <artifactId>Nunit.Framework</artifactId>
+ <artifactId>NUnit.Framework</artifactId>
<version>2.2.8.0</version>
<type>library</type>
</dependency>
Modified: incubator/nmaven/branches/SI_IDE/site/src/site/apt/getting-started.apt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/site/src/site/apt/getting-started.apt?view=diff&rev=520248&r1=520247&r2=520248
==============================================================================
--- incubator/nmaven/branches/SI_IDE/site/src/site/apt/getting-started.apt
(original)
+++ incubator/nmaven/branches/SI_IDE/site/src/site/apt/getting-started.apt Mon
Mar 19 20:16:41 2007
@@ -110,7 +110,7 @@
<dependency>
<groupId>NUnit</groupId>
- <artifactId>Nunit.Framework</artifactId>
+ <artifactId>nunit.framework</artifactId>
<version>2.2.8.0</version>
<type>library</type>
</dependency>
Added: incubator/nmaven/branches/SI_IDE/thirdparty/NUnit/NUnit.Framework.dll
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/thirdparty/NUnit/NUnit.Framework.dll?view=auto&rev=520248
==============================================================================
Binary file - no diff available.
Propchange:
incubator/nmaven/branches/SI_IDE/thirdparty/NUnit/NUnit.Framework.dll
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
