From 7392d4bf523eb3e3e354a4a136d7935d7d59c5a9 Mon Sep 17 00:00:00 2001 From: Leonardo Taglialegne Date: Thu, 11 Jul 2013 17:14:10 +0200 Subject: [PATCH] [Fpm] Setup autotools for fpm --- configure.ac | 2 ++ src/Makefile.am | 6 ++++ src/Mono.WebServer.Fpm/AssemblyInfo.cs | 35 ------------------- src/Mono.WebServer.Fpm/AssemblyInfo.cs.in | 8 +++++ src/Mono.WebServer.Fpm/Makefile.am | 31 ++++++++++++++++ .../Mono.WebServer.Fpm.sources | 6 ++++ 6 files changed, 53 insertions(+), 35 deletions(-) delete mode 100644 src/Mono.WebServer.Fpm/AssemblyInfo.cs create mode 100644 src/Mono.WebServer.Fpm/AssemblyInfo.cs.in create mode 100644 src/Mono.WebServer.Fpm/Makefile.am create mode 100644 src/Mono.WebServer.Fpm/Mono.WebServer.Fpm.sources diff --git a/configure.ac b/configure.ac index 67047ff..f486a4d 100644 --- a/configure.ac +++ b/configure.ac @@ -140,6 +140,7 @@ AC_CONFIG_FILES([Makefile src/Mono.WebServer.FastCgi/Makefile src/Mono.WebServer.XSP/Makefile src/Mono.WebServer/Makefile + src/Mono.WebServer.Fpm/Makefile test/1.1/Makefile test/1.1/asp.net/Makefile test/1.1/authtest/Makefile @@ -174,6 +175,7 @@ AC_CONFIG_FILES([Makefile src/Mono.WebServer/AssemblyInfo4.cs src/Mono.WebServer.Apache/AssemblyInfo.cs src/Mono.WebServer.FastCgi/AssemblyInfo.cs + src/Mono.WebServer.Fpm/AssemblyInfo.cs src/Mono.WebServer.XSP/AssemblyInfo.cs src/Mono.WebServer.XSP/xsp.pc src/Mono.WebServer.XSP/xsp-2.pc diff --git a/src/Makefile.am b/src/Makefile.am index b61b5d0..313025f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,13 @@ if XSP_ONLY SUBDIRS=Mono.WebServer Mono.WebServer.XSP else + +if NET_4_0 +SUBDIRS=Mono.WebServer Mono.WebServer.XSP Mono.WebServer.Apache Mono.WebServer.FastCgi Mono.WebServer.Fpm +else SUBDIRS=Mono.WebServer Mono.WebServer.XSP Mono.WebServer.Apache Mono.WebServer.FastCgi endif +endif + EXTRA_DIST = mono.pub mono.snk diff --git a/src/Mono.WebServer.Fpm/AssemblyInfo.cs b/src/Mono.WebServer.Fpm/AssemblyInfo.cs deleted file mode 100644 index 665e00f..0000000 --- a/src/Mono.WebServer.Fpm/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -// -// AssemblyInfo.cs: -// -// Author: -// Leonardo Taglialegne -// -// Copyright (c) 2013 Leonardo Taglialegne. -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System.Reflection; - -[assembly: AssemblyVersion ("0.1.0.0")] -[assembly: AssemblyTitle ("Mono.WebServer.Fpm")] -[assembly: AssemblyDescription ("Mono's FastCgi Process Manager")] -//[assembly: AssemblyCompany ("")] -[assembly: AssemblyCopyright ("(c) 2013 Leonardo Taglialegne")] diff --git a/src/Mono.WebServer.Fpm/AssemblyInfo.cs.in b/src/Mono.WebServer.Fpm/AssemblyInfo.cs.in new file mode 100644 index 0000000..fde3f70 --- /dev/null +++ b/src/Mono.WebServer.Fpm/AssemblyInfo.cs.in @@ -0,0 +1,8 @@ +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyVersion("@XSP_VERSION@")] +[assembly: AssemblyTitle("Mono.WebServer.Fpm")] +[assembly: AssemblyDescription("FastCGI Process Manager for XSP")] +[assembly: AssemblyCopyright("2013 Leonardo Taglialegne")] + diff --git a/src/Mono.WebServer.Fpm/Makefile.am b/src/Mono.WebServer.Fpm/Makefile.am new file mode 100644 index 0000000..d542992 --- /dev/null +++ b/src/Mono.WebServer.Fpm/Makefile.am @@ -0,0 +1,31 @@ +builddir=$(top_builddir)/src/Mono.WebServer.Fpm + +MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING) -unsafe+ -keyfile:$(top_srcdir)/src/mono.snk + +XSP_EXE = mono-fpm.exe +GACUTIL4=$(GACUTIL) -package 4.5 + +noinst_SCRIPTS = $(XSP_EXE) + +CLEANFILES = *.exe *.mdb + +references_common = -r:System.Web.dll -r:System.Configuration.dll -r:Mono.Security.dll -r:Mono.Posix.dll +references = $(references_common) -r:../Mono.WebServer/4.0/Mono.WebServer2.dll -r:../Mono.WebServer.FastCgi/fastcgi-mono-server4.exe + +sources = $(shell cat $(srcdir)/Mono.WebServer.Fpm.sources) +build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs + +EXTRA_DIST = $(sources) AssemblyInfo.cs.in $(resources) Mono.WebServer.Fpm.sources + +mono-fpm.exe: $(build_sources) + $(DMCS) -d:NET_2_0 -d:NET_4_0 $(MCSFLAGS) $(references) /out:$@ \ + $(build_sources) + $(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk + +install-data-local: + $(GACUTIL4) $(GACUTIL_FLAGS) -i $(builddir)/mono-fpm.exe + +uninstall-local: + -for i in $(noinst_SCRIPTS) ; do \ + $(GACUTIL) $(GACUTIL_FLAGS) -u $$(basename $$i .exe) ; \ + done diff --git a/src/Mono.WebServer.Fpm/Mono.WebServer.Fpm.sources b/src/Mono.WebServer.Fpm/Mono.WebServer.Fpm.sources new file mode 100644 index 0000000..1ed3c56 --- /dev/null +++ b/src/Mono.WebServer.Fpm/Mono.WebServer.Fpm.sources @@ -0,0 +1,6 @@ +ChildConfigurationManager.cs +ChildInfo.cs +ChildrenManager.cs +ConfigurationManager.cs +main.cs +Spawner.cs