From 1191297f5a4ecc5dadb1054552c5aadaf31989a0 Mon Sep 17 00:00:00 2001 From: gonzalo Date: Tue, 26 Jul 2005 23:38:00 +0000 Subject: [PATCH] 2005-07-26 Gonzalo Paniagua Javier * configure.in: * src/Makefile.am: * src/Mono.WebServer/xsp-2.pc.in: * src/Mono.WebServer/xsp.pc.in: * src/Mono.WebServer/key.snk: * src/Mono.WebServer/AssemblyInfo2.cs.in: * src/Mono.WebServer/AssemblyInfo.cs.in: * src/Mono.WebServer/Makefile.am: * scripts/Makefile.am: bye bye gacutil, welcome "Application Deployment Guidelines". git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/xsp@47726 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- ChangeLog | 13 ++++++++++++ configure.in | 21 ++++++-------------- scripts/Makefile.am | 4 ++-- src/Makefile.am | 16 +++++++++------ src/Mono.WebServer/AssemblyInfo.cs.in | 7 ++----- .../{AssemblyInfo.cs.in => AssemblyInfo2.cs.in} | 9 +++------ src/Mono.WebServer/Makefile.am | 22 ++++++++++----------- src/Mono.WebServer/key.snk | Bin 596 -> 0 bytes src/Mono.WebServer/xsp-2.pc.in | 9 +++++++++ src/Mono.WebServer/xsp.pc.in | 9 +++++++++ 10 files changed, 65 insertions(+), 45 deletions(-) copy src/Mono.WebServer/{AssemblyInfo.cs.in => AssemblyInfo2.cs.in} (88%) delete mode 100644 src/Mono.WebServer/key.snk create mode 100644 src/Mono.WebServer/xsp-2.pc.in create mode 100644 src/Mono.WebServer/xsp.pc.in diff --git a/ChangeLog b/ChangeLog index 5de5e2402..876533079 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2005-07-26 Gonzalo Paniagua Javier + + * configure.in: + * src/Makefile.am: + * src/Mono.WebServer/xsp-2.pc.in: + * src/Mono.WebServer/xsp.pc.in: + * src/Mono.WebServer/key.snk: + * src/Mono.WebServer/AssemblyInfo2.cs.in: + * src/Mono.WebServer/AssemblyInfo.cs.in: + * src/Mono.WebServer/Makefile.am: + * scripts/Makefile.am: bye bye gacutil, welcome "Application Deployment + Guidelines". + 2005-06-22 Gonzalo Paniagua Javier * src/Mono.WebServer/XSPApplicationHost.cs: if reading from the socket diff --git a/configure.in b/configure.in index 347381243..25c589286 100644 --- a/configure.in +++ b/configure.in @@ -6,12 +6,11 @@ AM_MAINTAINER_MODE AC_PROG_INSTALL -AC_PATH_PROG(GACUTIL, gacutil, no) -if test "x$GACUTIL" = "xno" ; then - AC_MSG_ERROR([No gacutil tool found]) +AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +if test "x$PKG_CONFIG" = "xno"; then + AC_MSG_ERROR([You need to install pkg-config]) fi - AC_PATH_PROG(CSC, csc, no) AC_PATH_PROG(MCS, mcs, no) AC_PATH_PROG(GMCS, gmcs, no) @@ -26,11 +25,6 @@ if test "x$MCS" = "xno" ; then MCS=$CSC fi -if test "x$CSC" = xno; then - GACUTIL_FLAGS='/gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib' - AC_SUBST(GACUTIL_FLAGS) -fi - if test "x$GMCS" != "xno" ; then AC_MSG_CHECKING([whether gmcs is actually able to compile...]) @@ -60,18 +54,12 @@ AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes) AM_CONDITIONAL(NET_2_0, test ! x$GMCS = xno) AM_CONDITIONAL(XSP_ONLY, test ! x$CSC = xno) -AC_PATH_PROG(GACUTIL, gacutil, no) -if test "x$GACUTIL" = "xno" ; then - AC_MSG_ERROR([gacutil not found]) -fi - echo "$CS compiler: $MCS" test x$GMCS = xno || echo "$CS 2.0 compiler: $GMCS" AC_SUBST(MCS) AC_SUBST(GMCS) AC_SUBST(RUNTIME) -AC_SUBST(GACUTIL) AC_OUTPUT([ Makefile man/xsp.1 @@ -83,7 +71,10 @@ AC_OUTPUT([ src/AssemblyInfo.cs src/AssemblyInfoModMono.cs src/Mono.WebServer/AssemblyInfo.cs + src/Mono.WebServer/AssemblyInfo2.cs src/Mono.WebServer/Makefile + src/Mono.WebServer/xsp.pc + src/Mono.WebServer/xsp-2.pc test/Makefile test/1.1/Makefile test/1.1/authtest/Makefile diff --git a/scripts/Makefile.am b/scripts/Makefile.am index b02baa15d..01407a7d7 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -10,8 +10,8 @@ bin_SCRIPTS = $(bin1_scripts) $(bin2_scripts) CLEANFILES = $(bin1_scripts) $(bin2_scripts_real) -plat_bindir = $(prefix)/lib/mono/1.0 -plat_bindir2 = $(prefix)/lib/mono/2.0 +plat_bindir = $(prefix)/lib/xsp/1.0 +plat_bindir2 = $(prefix)/lib/xsp/2.0 REWRITE = sed \ -e 's,@''plat_bindir@,$(plat_bindir),g' \ diff --git a/src/Makefile.am b/src/Makefile.am index 24c87bd30..437c455ea 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,10 +2,10 @@ SUBDIRS=Mono.WebServer MCSFLAGS= -debug+ -debug:full -nologo -xspdir = $(prefix)/lib/mono/1.0 -modmonoserverdir = $(prefix)/lib/mono/1.0 -xsp2dir = $(prefix)/lib/mono/2.0 -modmonoserver2dir = $(prefix)/lib/mono/2.0 +xspdir = $(prefix)/lib/xsp/1.0 +modmonoserverdir = $(prefix)/lib/xsp/1.0 +xsp2dir = $(prefix)/lib/xsp/2.0 +modmonoserver2dir = $(prefix)/lib/xsp/2.0 if NET_2_0 XSP2_EXE = xsp2.exe @@ -26,11 +26,15 @@ EXTRA_DIST = $(xsp_sources) $(modmono_only) AssemblyInfo.cs.in AssemblyInfoModMo # xsp_references= -r:System.Web.dll -r:Mono.WebServer/Mono.WebServer.dll -r:Mono.Security.dll +xsp2_references= -r:System.Web.dll -r:Mono.WebServer/Mono.WebServer2.dll -r:Mono.Security.dll if PLATFORM_WIN32 modmono_references= -lib:"$(prefix)/lib" -r:Mono.WebServer/Mono.WebServer.dll \ -r:System.Web.dll -r:Mono.Posix.dll +modmono2_references= -lib:"$(prefix)/lib" -r:Mono.WebServer/Mono.WebServer2.dll \ + -r:System.Web.dll -r:Mono.Posix.dll else modmono_references= -r:System.Web.dll -r:Mono.WebServer/Mono.WebServer.dll -r:Mono.Posix.dll +modmono2_references= -r:System.Web.dll -r:Mono.WebServer/Mono.WebServer2.dll -r:Mono.Posix.dll endif xsp_sources = server.cs @@ -52,8 +56,8 @@ mod-mono-server.exe: $(modmono_build_sources) $(MCS) $(MCSFLAGS) $(modmono_references) /d:MODMONO_SERVER /out:$@ $(modmono_build_sources) xsp2.exe: $(xsp_build_sources) - $(GMCS) $(MCSFLAGS) $(xsp_references) /out:$@ $(xsp_build_sources) + $(GMCS) $(MCSFLAGS) $(xsp2_references) /out:$@ $(xsp_build_sources) mod-mono-server2.exe: $(modmono_build_sources) - $(GMCS) $(MCSFLAGS) $(modmono_references) /d:MODMONO_SERVER /out:$@ $(modmono_build_sources) + $(GMCS) $(MCSFLAGS) $(modmono2_references) /d:MODMONO_SERVER /out:$@ $(modmono_build_sources) diff --git a/src/Mono.WebServer/AssemblyInfo.cs.in b/src/Mono.WebServer/AssemblyInfo.cs.in index 514171412..74b3b9dee 100644 --- a/src/Mono.WebServer/AssemblyInfo.cs.in +++ b/src/Mono.WebServer/AssemblyInfo.cs.in @@ -28,12 +28,9 @@ using System.Reflection; using System.Runtime.CompilerServices; -[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyVersion("0.1.0.0")] [assembly: AssemblyTitle ("Mono.WebServer")] -[assembly: AssemblyDescription ("Classes for embedding an ASP.NET server in your application.")] +[assembly: AssemblyDescription ("Classes for embedding an ASP.NET server in your application .NET 1.1")] [assembly: AssemblyCopyright ("(c) 2002-2005 Novell, Inc.")] [assembly: AssemblyCompany ("Novell, Inc.")] -[assembly:AssemblyDelaySign (false)] -[assembly:AssemblyKeyFile ("@srcdir@/key.snk")] - diff --git a/src/Mono.WebServer/AssemblyInfo.cs.in b/src/Mono.WebServer/AssemblyInfo2.cs.in similarity index 88% copy from src/Mono.WebServer/AssemblyInfo.cs.in copy to src/Mono.WebServer/AssemblyInfo2.cs.in index 514171412..2bb2021d8 100644 --- a/src/Mono.WebServer/AssemblyInfo.cs.in +++ b/src/Mono.WebServer/AssemblyInfo2.cs.in @@ -28,12 +28,9 @@ using System.Reflection; using System.Runtime.CompilerServices; -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyTitle ("Mono.WebServer")] -[assembly: AssemblyDescription ("Classes for embedding an ASP.NET server in your application.")] +[assembly: AssemblyVersion("0.1.0.0")] +[assembly: AssemblyTitle ("Mono.WebServer2")] +[assembly: AssemblyDescription ("Classes for embedding an ASP.NET server in your application .NET 2.0.")] [assembly: AssemblyCopyright ("(c) 2002-2005 Novell, Inc.")] [assembly: AssemblyCompany ("Novell, Inc.")] -[assembly:AssemblyDelaySign (false)] -[assembly:AssemblyKeyFile ("@srcdir@/key.snk")] - diff --git a/src/Mono.WebServer/Makefile.am b/src/Mono.WebServer/Makefile.am index 3615604c5..62cd9a098 100644 --- a/src/Mono.WebServer/Makefile.am +++ b/src/Mono.WebServer/Makefile.am @@ -1,17 +1,19 @@ +pkgconfigdir=$(libdir)/pkgconfig MCSFLAGS= -debug+ -debug:full -nologo -monowebserverdir = $(prefix)/lib/mono/1.0 -monowebserver2dir = $(prefix)/lib/mono/2.0 +monowebserverdir = $(prefix)/lib/xsp/1.0 +monowebserver2dir = $(prefix)/lib/xsp/2.0 +pkgconfig_DATA = xsp.pc xsp-2.pc monowebserver_SCRIPTS = Mono.WebServer.dll monowebserver2_SCRIPTS = $(monowebserver2_install) if NET_2_0 -monowebserver2_install = Mono.WebServer.dll +monowebserver2_install = Mono.WebServer2.dll endif -CLEANFILES = Mono.WebServer.dll Mono.WebServer.dll.mdb Mono.WebServer.dll.pdb -EXTRA_DIST = $(monowebserver_sources) key.snk AssemblyInfo.cs.in +CLEANFILES = Mono.WebServer.dll* Mono.WebServer2.dll* +EXTRA_DIST = $(monowebserver_sources) AssemblyInfo.cs.in AssemblyInfo2.cs.in # monowebserver_references= -r:System.Web.dll -r:Mono.Security.dll @@ -29,13 +31,11 @@ monowebserver_sources = \ XSPWorkerRequest.cs monowebserver_build_sources = $(addprefix $(srcdir)/, $(monowebserver_sources)) $(addprefix $(top_builddir)/src/Mono.WebServer/, AssemblyInfo.cs) +monowebserver2_build_sources = $(addprefix $(srcdir)/, $(monowebserver_sources)) $(addprefix $(top_builddir)/src/Mono.WebServer/, AssemblyInfo2.cs) -Mono.WebServer.dll: $(monowebserver_build_sources) key.snk +Mono.WebServer.dll: $(monowebserver_build_sources) $(MCS) $(MCSFLAGS) $(monowebserver_references) /target:library /out:$@ $(monowebserver_build_sources) -install-data-local: - $(GACUTIL) $(GACUTIL_FLAGS) -i Mono.WebServer.dll - -uninstall-local: - $(GACUTIL) $(GACUTIL_FLAGS) -u Mono.WebServer +Mono.WebServer2.dll: $(monowebserver2_build_sources) + $(GMCS) $(MCSFLAGS) $(monowebserver_references) /target:library /out:$@ $(monowebserver2_build_sources) diff --git a/src/Mono.WebServer/key.snk b/src/Mono.WebServer/key.snk deleted file mode 100644 index c97d7eb673bce401bca990c844365bd80ec8a00f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 596 zcwPZi0;~N80ssI2Bme+XQ$aES1ONaL0001E=ZW3AruQIc)gwQjV8LR#;q;Fr2fuLY z1CFckPk0ZpLwf77(CYFKJ?nTC|H9@RK7DqCe2PTsqSPBu=BuLu9hgM(wMEa8+j0dK zlWzbju?%eo9!wTLVXM8Ue!eQmR(Vk<15oNFiKQe(6NQI$BpP>dY8J9>@rR0N;j zwpJKvDf?w25w)TaF->GeN8){@JkuU*%%c0YRyaqG3Vj)lE{)* zHGga^aOcw2mIZ2!i}>x$R(M-cSo-VjepP!aP~q+6QkxLY%L8@~-JV_YHx(hT~r3{pI z?HBbFM&1v(?U-{zzn_rC6;lOn@^We|+<$FxxeE9+v9%I6ul_0bw2gTzrlcvVcKI!L z*2Y&dlhOuZ3F_P=4#2F16_xx&sg14t>6L$HtbK+@MSr6@O#Vr?@}i6K&`)fkE6U}B z^g1Ep*a}HW#hmrB@vq)u6NbrBnB|^L40HFJ4(ASy2l>hN;~PS@YpTTF%tnNKy2BP4 zI