diff --git a/configure.in b/configure.in index 300e545..72bed96 100644 --- a/configure.in +++ b/configure.in @@ -18,6 +18,14 @@ if test "x$MCS" = "xno" ; then MCS=$CSC fi +case "$host" in + *-*-mingw*|*-*-cygwin*) + platform_win32=yes + ;; +esac + +AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes) + echo "$CS compiler: $MCS" AC_SUBST(MCS) diff --git a/tools/nunitasp/source/NUnitAsp/AssemblyInfo.cs b/tools/nunitasp/source/NUnitAsp/AssemblyInfo.cs index b329507..fc17f56 100644 --- a/tools/nunitasp/source/NUnitAsp/AssemblyInfo.cs +++ b/tools/nunitasp/source/NUnitAsp/AssemblyInfo.cs @@ -1 +1,44 @@ -using System.Reflection;using System.Runtime.CompilerServices;//// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information// associated with an assembly.//[assembly: AssemblyTitle("NUnitAsp")][assembly: AssemblyDescription("Unit testing framework for ASP.NET")][assembly: AssemblyConfiguration("")][assembly: AssemblyCompany("")][assembly: AssemblyProduct("")][assembly: AssemblyCopyright("Copyright 2002, 2003, Brian Knowles, Jim Shore. See license.txt for redistribution and warranty information.")][assembly: AssemblyTrademark("")][assembly: AssemblyCulture("")]//// Version information for an assembly consists of the following four values://// Major Version// Minor Version // Build Number// Revision//// You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below:[assembly: AssemblyVersion("1.4.0.*")]//// In order to sign your assembly you must specify a key to use. Refer to the // Microsoft .NET Framework documentation for more information on assembly signing.//// Use the attributes below to control which key is used for signing. //// Notes: // (*) If no key is specified, the assembly is not signed.// (*) KeyName refers to a key that has been installed in the Crypto Service// Provider (CSP) on your machine. KeyFile refers to a file which contains// a key.// (*) If the KeyFile and the KeyName values are both specified, the // following processing occurs:// (1) If the KeyName can be found in the CSP, that key is used.// (2) If the KeyName does not exist and the KeyFile does exist, the key // in the KeyFile is installed into the CSP and used.// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.// When specifying the KeyFile, the location of the KeyFile should be// relative to the project output directory which is// %Project Directory%\obj\. For example, if your KeyFile is// located in the project directory, you would specify the AssemblyKeyFile // attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework// documentation for more information on this.//[assembly: AssemblyDelaySign(false)][assembly: AssemblyKeyFile(@"..\..\NUnitAsp.snk")][assembly: AssemblyKeyName("NUnitAsp")] \ No newline at end of file +using System.Reflection;using System.Runtime.CompilerServices; +// +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. + +[assembly: AssemblyTitle("NUnitAsp")] +[assembly: AssemblyDescription("Unit testing framework for ASP.NET")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("")] +[assembly: AssemblyCopyright("Copyright 2002, 2003, Brian Knowles, Jim Shore. See license.txt for redistribution and warranty information.")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +// Version information for an assembly consists of the following four values: +// Major Version +// Minor Version +// Build Number +// Revision +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("1.4.0.*")] +// In order to sign your assembly you must specify a key to use. Refer to the +// Microsoft .NET Framework documentation for more information on assembly signing. +// Use the attributes below to control which key is used for signing. +// Notes: +// (*) If no key is specified, the assembly is not signed. +// (*) KeyName refers to a key that has been installed in the Crypto Service +// Provider (CSP) on your machine. KeyFile refers to a file which contains +// a key. +// (*) If the KeyFile and the KeyName values are both specified, the +// following processing occurs: +// (1) If the KeyName can be found in the CSP, that key is used. +// (2) If the KeyName does not exist and the KeyFile does exist, the key +// in the KeyFile is installed into the CSP and used. +// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility. +// When specifying the KeyFile, the location of the KeyFile should be +// relative to the project output directory which is +// %Project Directory%\obj\. For example, if your KeyFile is +// located in the project directory, you would specify the AssemblyKeyFile +// attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")] +// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework +// documentation for more information on this. +//[assembly: AssemblyDelaySign(false)][assembly: AssemblyKeyFile(@"..\..\NUnitAsp.snk")][assembly: AssemblyKeyName("NUnitAsp")] diff --git a/tools/nunitasp/source/NUnitAsp/Makefile.am b/tools/nunitasp/source/NUnitAsp/Makefile.am index 1862c65..c889ae6 100644 --- a/tools/nunitasp/source/NUnitAsp/Makefile.am +++ b/tools/nunitasp/source/NUnitAsp/Makefile.am @@ -1,14 +1,16 @@ SUBDIRS = AspTester HtmlTester Sgml +if PLATFORM_WIN32 +MCSFLAGS= -debug+ -debug:full -nologo -lib:"$(libdir)" +else MCSFLAGS= -debug+ -debug:full -nologo +endif nunitaspdir = $(libdir) nunitasp_SCRIPTS = NUnitAsp.dll EXTRA_DIST = $(local_sources) NUnitAsp.csproj CLEANFILES = NUnitAsp.dll -htmldtd = $(srcdir)/Sgml/Html.dtd - asptesterdir_sources = \ ./AspTester/AspControlTester.cs \ ./AspTester/ButtonTester.cs \ @@ -53,8 +55,16 @@ nunitasp_sources = \ $(sgmldir_sources) \ $(local_sources) -NUnitAsp.dll: $(nunitasp_sources) - $(MCS) $(MCSFLAGS) -r System.Web.dll -r NUnit.Framework.dll \ - -resource:$(htmldtd),NUnit.Extensions.Asp.Sgml.Html.dtd \ - -target:library -out:$@ $^ +htmldtd = $(srcdir)/Sgml/Html.dtd + +if PLATFORM_WIN32 +files=$(subst /,\\,$(nunitasp_sources)) +else +files=$(nunitasp_sources) +endif + +NUnitAsp.dll: $(nunitasp_sources) + $(MCS) $(MCSFLAGS) -r:System.Web.dll -r:NUnit.Framework.dll \ + -resource:"$(htmldtd)",NUnit.Extensions.Asp.Sgml.Html.dtd \ + -target:library -out:$@ $(files) diff --git a/tools/nunitasp/source/NUnitAspTest/Makefile.am b/tools/nunitasp/source/NUnitAspTest/Makefile.am index 9612b26..bf29388 100644 --- a/tools/nunitasp/source/NUnitAspTest/Makefile.am +++ b/tools/nunitasp/source/NUnitAspTest/Makefile.am @@ -1,6 +1,10 @@ SUBDIRS = AspTester HtmlTester +if PLATFORM_WIN32 +MCSFLAGS= -debug+ -debug:full -nologo -lib:../NUnitAsp -lib:"$(libdir)" +else MCSFLAGS= -debug+ -debug:full -nologo -lib:../NUnitAsp +endif nunitasptestdir = $(libdir) nunitasptest_SCRIPTS = NUnitAspTest.dll @@ -45,9 +49,15 @@ nunitasptest_sources = \ $(asptesterdir_sources) \ $(htmltesterdir_sources) +if PLATFORM_WIN32 +files=$(subst /,\\,$(nunitasptest_sources)) +else +files=$(nunitasptest_sources) +endif + NUnitAspTest.dll: $(nunitasptest_sources) $(MCS) $(MCSFLAGS) -r:System.Web.dll -lib:../AspTest \ - -r NUnitAsp.dll -r NUnit.Framework.dll \ - -r System.DirectoryServices \ - -target:library -out:$@ $^ + -r:NUnitAsp.dll -r:NUnit.Framework.dll \ + -r:System.DirectoryServices.dll \ + -target:library -out:$@ $(files)