Permalink
Browse files

Removed 1.1 bits from build

svn path=/trunk/xsp/; revision=143254
  • Loading branch information...
1 parent 6917ee8 commit 7d9085ca7486e911dff0a9133b54dc0586de33f4 @grendello grendello committed Oct 2, 2009
View
12 configure.in
@@ -34,7 +34,6 @@ AC_ARG_WITH([runtime],
[RUNTIME=$withval])
AC_PATH_PROG(CSC, csc, no)
-AC_PATH_PROG(MCS, mcs, no)
AC_PATH_PROG(GMCS, gmcs, no)
if test "x$RUNTIME" = "x" ; then
@@ -49,15 +48,11 @@ fi
AC_PATH_PROG(GACUTIL, gacutil, no)
AC_PATH_PROG(SN, sn, no)
CS="C#"
-if test "x$CSC" = "xno" -a "x$MCS" = "xno" ; then
+if test "x$CSC" = "xno" -a "x$GMCS" = "xno" ; then
dnl AC_MSG_ERROR([You need to install a C# compiler])
AC_MSG_ERROR([No $CS compiler found])
fi
-if test "x$MCS" = "xno" ; then
- MCS=$CSC
-fi
-
if test "x$GMCS" != "xno" ; then
AC_MSG_CHECKING([whether gmcs is actually able to compile...])
@@ -98,7 +93,6 @@ export VERSION
AC_SUBST(WEBTRACING)
-AC_SUBST(MCS)
AC_SUBST(GMCS)
AC_SUBST(RUNTIME)
AC_SUBST(GACUTIL)
@@ -159,5 +153,5 @@ AC_OUTPUT([
echo
echo "Runtime: $RUNTIME"
-echo "$CS compiler: $MCS"
-test x$GMCS = xno || echo "$CS 2.0 compiler: $GMCS"
+echo "$CS compiler: $GMCS"
+
View
40 scripts/Makefile.am
@@ -1,55 +1,29 @@
EXTRA_DIST = script.in
bin2_scripts_real = xsp2 mod-mono-server2 fastcgi-mono-server2
-if NET_2_0
bin2_scripts = $(bin2_scripts_real)
tool2_scripts = asp-state2 dbsessmgr2
-endif
bin_scripts = xsp mod-mono-server fastcgi-mono-server
tool_scripts = asp-state dbsessmgr
-bin1_scripts = xsp1 mod-mono-server1 fastcgi-mono-server1
-tool1_scripts = asp-state1 dbsessmgr1
+bin_SCRIPTS = $(bin2_scripts) $(tool2_scripts) $(tool_scripts) $(bin_scripts)
-bin_SCRIPTS = $(bin1_scripts) $(bin2_scripts) $(tool1_scripts) $(tool2_scripts) $(tool_scripts) $(bin_scripts)
+CLEANFILES = $(bin2_scripts_real) $(tool2_scripts) $(bin_scripts) $(tool_scripts)
-CLEANFILES = $(bin1_scripts) $(bin2_scripts_real) $(tool1_scripts) $(tool2_scripts) $(bin_scripts) $(tool_scripts)
-
-plat_bindir = $(prefix)/lib/mono/1.0
plat_bindir2 = $(prefix)/lib/mono/2.0
-plat_tooldir = $(prefix)/lib/xsp/1.0
plat_tooldir2 = $(prefix)/lib/xsp/2.0
-REWRITE = sed \
- -e 's,@''plat_bindir@,$(plat_bindir),g' \
- -e 's,@''exe_file@,'`basename $@ 1`'.exe,g' \
- -e 's,@''RUNTIME@,@RUNTIME@,g'
-
REWRITE2 = sed \
-e 's,@''plat_bindir@,$(plat_bindir2),g' \
-e 's,@''exe_file@,'`basename $@ 2`'2.exe,g' \
-e 's,@''RUNTIME@,@RUNTIME@,g'
-REWRITE_TOOLS = sed \
- -e 's,@''plat_bindir@,$(plat_tooldir),g' \
- -e 's,@''exe_file@,'`basename $@ 1`'.exe,g' \
- -e 's,@''RUNTIME@,@RUNTIME@,g'
-
REWRITE_TOOLS2 = echo dd $@ dd; sed \
-e 's,@''plat_bindir@,$(plat_tooldir2),g' \
-e 's,@''exe_file@,'`basename $@ 2`'2.exe,g' \
-e 's,@''RUNTIME@,@RUNTIME@,g'
-$(bin1_scripts): $(srcdir)/script.in Makefile.am
- e=`basename $@ 1`; $(REWRITE) $(srcdir)/script.in > $@.tmp
- mv $@.tmp $@
-
-$(tool1_scripts): $(srcdir)/script.in Makefile.am
- $(REWRITE_TOOLS) $(srcdir)/script.in > $@.tmp
- mv $@.tmp $@
-
-if NET_2_0
$(bin2_scripts): $(srcdir)/script.in Makefile.am
$(REWRITE2) $(srcdir)/script.in > $@.tmp
mv $@.tmp $@
@@ -65,13 +39,3 @@ $(bin_scripts): $(srcdir)/script.in Makefile.am
$(tool_scripts): $(srcdir)/script.in Makefile.am
$(REWRITE_TOOLS2) $(srcdir)/script.in > $@.tmp
mv $@.tmp $@
-else
-$(bin_scripts): $(srcdir)/script.in Makefile.am
- $(REWRITE) $(srcdir)/script.in > $@.tmp
- mv $@.tmp $@
-
-$(tool_scripts): $(srcdir)/script.in Makefile.am
- $(REWRITE_TOOLS) $(srcdir)/script.in > $@.tmp
- mv $@.tmp $@
-endif
-
View
19 src/Mono.WebServer.Apache/Makefile.am
@@ -2,24 +2,17 @@ builddir=$(top_builddir)/src/Mono.WebServer.Apache
MCSFLAGS= -unsafe -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING)
-GACUTIL1=$(GACUTIL) -package 1.0
-
-if NET_2_0
MODMONOSERVER2_EXE = mod-mono-server2.exe
GACUTIL2=$(GACUTIL) -package 2.0
-endif
-noinst_SCRIPTS=mod-mono-server.exe $(MODMONOSERVER2_EXE)
+noinst_SCRIPTS = $(MODMONOSERVER2_EXE)
CLEANFILES = *.exe *.mdb
if PLATFORM_WIN32
-references= -lib:"$(prefix)/lib" -r:../Mono.WebServer/Mono.WebServer.dll \
- -r:System.Web.dll -r:Mono.Posix.dll -r:Mono.Security.dll
references2= -lib:"$(prefix)/lib" -r:../Mono.WebServer/Mono.WebServer2.dll \
-r:System.Web.dll -r:Mono.Posix.dll -r:Mono.Security.dll
else
-references= -r:System.Web.dll -r:../Mono.WebServer/Mono.WebServer.dll -r:Mono.Posix.dll -r:Mono.Security.dll
references2= -r:System.Web.dll -r:System.Configuration.dll -r:../Mono.WebServer/Mono.WebServer2.dll \
-r:Mono.Posix.dll -r:Mono.Security.dll
endif
@@ -30,22 +23,14 @@ build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
EXTRA_DIST = $(sources) AssemblyInfo.cs.in Mono.WebServer.Apache.sources
-
-mod-mono-server.exe: $(sources) AssemblyInfo.cs
- $(MCS) $(MCSFLAGS) $(references) /out:$@ $(build_sources)
- $(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk
-
mod-mono-server2.exe: $(sources) AssemblyInfo.cs
$(GMCS) -d:NET_2_0 $(MCSFLAGS) $(references2) /out:$@ $(build_sources)
$(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk
install-data-local:
- $(GACUTIL1) $(GACUTIL_FLAGS) -i $(builddir)/mod-mono-server.exe
-#if NET_2_0
$(GACUTIL2) $(GACUTIL_FLAGS) -i $(builddir)/mod-mono-server2.exe
-#endif
uninstall-local:
- -for i in mod-mono-server mod-mono-server2 ; do \
+ -for i in mod-mono-server2 ; do \
$(GACUTIL) $(GACUTIL_FLAGS) -u $$(basename $$i .exe) ; \
done
View
18 src/Mono.WebServer.FastCgi/Makefile.am
@@ -2,19 +2,14 @@ builddir=$(top_builddir)/src/Mono.WebServer.FastCgi
MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING) -unsafe+
-GACUTIL1=$(GACUTIL) -package 1.0
-
-if NET_2_0
XSP2_EXE = fastcgi-mono-server2.exe
GACUTIL2=$(GACUTIL) -package 2.0
-endif
-noinst_SCRIPTS = fastcgi-mono-server.exe $(XSP2_EXE)
+noinst_SCRIPTS = $(XSP2_EXE)
CLEANFILES = *.exe *.mdb
#
-references = -r:System.Web.dll -r:../Mono.WebServer/Mono.WebServer.dll -r:Mono.Security.dll -r:Mono.Posix.dll
references2 = -r:System.Web.dll -r:System.Configuration.dll -r:../Mono.WebServer/Mono.WebServer2.dll -r:Mono.Security.dll -r:Mono.Posix.dll
sources = $(shell cat $(srcdir)/Mono.WebServer.FastCgi.sources)
@@ -25,24 +20,15 @@ build_resources = $(addprefix $(srcdir)/, $(resources))
EXTRA_DIST = $(sources) AssemblyInfo.cs.in $(resources) Mono.WebServer.FastCgi.sources
-fastcgi-mono-server.exe: $(build_sources) $(build_resources)
- $(MCS) $(MCSFLAGS) $(references) /out:$@ \
- $(build_resources:%=-resource:%) $(build_sources)
- $(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk
-
fastcgi-mono-server2.exe: $(build_sources) $(build_resources)
$(GMCS) -d:NET_2_0 $(MCSFLAGS) $(references2) /out:$@ \
$(build_resources:%=-resource:%) $(build_sources)
$(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk
install-data-local:
- $(GACUTIL1) $(GACUTIL_FLAGS) -i $(builddir)/fastcgi-mono-server.exe
-
-#if NET_2_0
$(GACUTIL2) $(GACUTIL_FLAGS) -i $(builddir)/fastcgi-mono-server2.exe
-#endif
uninstall-local:
- -for i in fastcgi-mono-server fastcgi-mono-server2 ; do \
+ -for i in fastcgi-mono-server2 ; do \
$(GACUTIL) $(GACUTIL_FLAGS) -u $$(basename $$i .exe) ; \
done
View
17 src/Mono.WebServer.XSP/Makefile.am
@@ -2,19 +2,14 @@ builddir=$(top_builddir)/src/Mono.WebServer.XSP
MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING)
-GACUTIL1=$(GACUTIL) -package 1.0
-
-if NET_2_0
XSP2_EXE = xsp2.exe
GACUTIL2=$(GACUTIL) -package 2.0
-endif
-noinst_SCRIPTS=xsp.exe xsp.exe $(XSP2_EXE)
+noinst_SCRIPTS = $(XSP2_EXE)
CLEANFILES = *.exe *.mdb
#
-references = -r:System.Web.dll -r:../Mono.WebServer/Mono.WebServer.dll -r:Mono.Security.dll
references2 = -r:System.Web.dll -r:System.Configuration.dll -r:../Mono.WebServer/Mono.WebServer2.dll -r:Mono.Security.dll
sources = main.cs SecurityConfiguration.cs
@@ -23,22 +18,14 @@ build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
EXTRA_DIST = $(sources) AssemblyInfo.cs.in
-xsp.exe: $(build_sources)
- $(MCS) $(MCSFLAGS) $(references) /out:$@ $(build_sources)
- $(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk
-
xsp2.exe: $(build_sources)
$(GMCS) -d:NET_2_0 $(MCSFLAGS) $(references2) /out:$@ $(build_sources)
$(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk
install-data-local:
- $(GACUTIL1) $(GACUTIL_FLAGS) -i $(builddir)/xsp.exe
-
-#if NET_2_0
$(GACUTIL2) $(GACUTIL_FLAGS) -i $(builddir)/xsp2.exe
-#endif
uninstall-local:
- -for i in xsp xsp2 ; do \
+ -for i in xsp2 ; do \
$(GACUTIL) $(GACUTIL_FLAGS) -u $$(basename $$i .exe) ; \
done
View
32 src/Mono.WebServer/Makefile.am
@@ -3,27 +3,20 @@ builddir=$(top_builddir)/src/Mono.WebServer
MCSFLAGS= -debug+ -debug:full -nologo -unsafe -nowarn:618 $(WEBTRACING) -doc:$(top_builddir)/docs/Mono.WebServer.xml
SYSTEMCORE_DEP=@SYSTEMCORE_DEP@
-monowebserverdir = $(prefix)/lib/xsp/1.0
monowebserver2dir = $(prefix)/lib/xsp/2.0
-pkgconfig_DATA = xsp.pc xsp-2.pc
-noinst_SCRIPTS= Mono.WebServer.dll $(monowebserver2_install)
+pkgconfig_DATA = xsp-2.pc
+noinst_SCRIPTS= $(monowebserver2_install)
-GACUTIL1=$(GACUTIL) -package 1.0
-if NET_2_0
monowebserver2_install = Mono.WebServer2.dll
monowebserver2_references = -r:System.Web.dll -r:System.Configuration.dll -r:Mono.Security.dll
GACUTIL2=$(GACUTIL) -package 2.0
-endif
CLEANFILES = Mono.WebServer.dll* Mono.WebServer2.dll*
-EXTRA_DIST = $(monowebserver_sources) $(monowebserver2_sources) AssemblyInfo.cs.in AssemblyInfo2.cs.in
+EXTRA_DIST = $(monowebserver_sources) AssemblyInfo.cs.in AssemblyInfo2.cs.in
-#
-monowebserver_references= -r:System.Web.dll -r:Mono.Security.dll
-
-monowebserver_sources = \
+monowebserver2_sources = \
ApplicationServer.cs \
BaseApplicationHost.cs \
BaseRequestBroker.cs \
@@ -41,33 +34,22 @@ monowebserver_sources = \
Paths.cs \
VPathToHost.cs \
Tracing.cs \
- SearchPattern.cs
-
-monowebserver2_sources = $(monowebserver_sources) \
+ SearchPattern.cs \
ReaderWriterLockSlim.cs \
LockRecursionException.cs \
LockRecursionPolicy.cs
-monowebserver_build_sources = $(addprefix $(srcdir)/, $(monowebserver_sources)) $(addprefix $(top_builddir)/src/Mono.WebServer/, AssemblyInfo.cs)
monowebserver2_build_sources = $(addprefix $(srcdir)/, $(monowebserver2_sources)) $(addprefix $(top_builddir)/src/Mono.WebServer/, AssemblyInfo2.cs)
-Mono.WebServer.dll: $(monowebserver_build_sources)
- $(MCS) $(MCSFLAGS) $(monowebserver_references) /target:library /out:$@ $(monowebserver_build_sources)
- $(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk
-
Mono.WebServer2.dll: $(monowebserver2_build_sources)
$(GMCS) -d:NET_2_0 $(MCSFLAGS) $(monowebserver2_references) /target:library /out:$@ $(monowebserver2_build_sources)
$(SN) -q -R $(builddir)/$@ $(srcdir)/../mono.snk
install-data-local:
- $(GACUTIL1) $(GACUTIL_FLAGS) -i $(builddir)/Mono.WebServer.dll
-
-#if NET_2_0
$(GACUTIL2) $(GACUTIL_FLAGS) -i $(builddir)/Mono.WebServer2.dll
-#endif
-
+
uninstall-local:
- -for i in Mono.WebServer Mono.WebServer2 ; do \
+ -for i in Mono.WebServer2 ; do \
$(GACUTIL) $(GACUTIL_FLAGS) -u $$(basename $$i .exe) ; \
done
View
2 test/1.1/asp.net/Makefile.am
@@ -35,7 +35,7 @@ EXTRA_DIST = $(testfiles) \
CLEANFILES = $(samplesbin_SCRIPTS)
%.dll: %.cs
- $(MCS) -r:System.Web.dll -t:library -out:$@ $^
+ $(GMCS) -r:System.Web.dll -t:library -out:$@ $^
typedesc.dll: $(typedesc_build)
View
6 test/1.1/customcontrol/Makefile.am
@@ -4,7 +4,7 @@ testfiles = \
tabcontrol2.aspx \
tabcontrol.aspx \
index.aspx
-
+
tabcontrol_src = tabcontrol.cs
tabcontrol2_src = tabcontrol2.cs
@@ -19,11 +19,11 @@ samplesbin_SCRIPTS = tabcontrol.dll tabcontrol2.dll
EXTRA_DIST = $(testfiles) \
$(tabcontrol_src) \
$(tabcontrol2_src)
-
+
CLEANFILES = $(samplesbin_SCRIPTS)
%.dll: %.cs
- $(MCS) -r:System.Web.dll -t:library -out:$@ $^
+ $(GMCS) -r:System.Web.dll -t:library -out:$@ $^
tabcontrol.dll: $(tabcontrol_build)
View
2 test/1.1/webcontrols/Makefile.am
@@ -48,7 +48,7 @@ dbpage_test_setup_build = dbpage_test_setup.cs
EXTRA_DIST = $(sqlite_DATA) $(samples_DATA) $(dbpage_test_setup_build)
dbpage_test_setup.exe: $(dbpage_test_setup_build)
- $(MCS) -debug:full -r:Mono.Data.SqliteClient.dll -out:$@ $^
+ $(GMCS) -debug:full -r:Mono.Data.SqliteClient.dll -out:$@ $^
dbpage1.sqlite: dbpage_test_setup.exe
$(RUNTIME) dbpage_test_setup.exe
View
6 test/1.1/webservice/Makefile.am
@@ -29,14 +29,14 @@ EXTRA_DIST = $(testfiles) \
$(serviceclient_src)
%.dll: %.cs
- $(MCS) -r:System.Web.dll -t:library -out:$@ $^
+ $(GMCS) -r:System.Web.dll -t:library -out:$@ $^
extensions.dll: $(extensions_build)
- $(MCS) -r:System.Web.dll -r:System.Web.Services.dll -target:library \
+ $(GMCS) -r:System.Web.dll -r:System.Web.Services.dll -target:library \
-out:$@ $^
ServiceClient.exe: extensions.dll $(serviceclient_build)
- $(MCS) -r:System.Web.dll -r:System.Web.Services.dll -r:extensions.dll \
+ $(GMCS) -r:System.Web.dll -r:System.Web.Services.dll -r:extensions.dll \
-out:$@ \
$(srcdir)/ServiceClient.cs $(srcdir)/Reference.cs
View
16 test/Makefile.am
@@ -1,9 +1,4 @@
-SUBDIRS = controls
-if NET_2_0
-SUBDIRS += 1.1 2.0 App_Code
-else
-SUBDIRS += 1.1
-endif
+SUBDIRS = controls 1.1 2.0 App_Code
testfiles = \
mod-mono-server.exe.config \
@@ -25,13 +20,4 @@ testfiles = \
samplesdir = $(pkglibdir)/test
samples_DATA = $(testfiles)
-samplesbindir = $(pkglibdir)/test/bin
-samplesbin_SCRIPTS = SiteMapReader_1.1.dll
-
-sitemapreader_build = SiteMapReader_1.1.cs
-
-CLEANFILES = $(samplesbin_SCRIPTS)
EXTRA_DIST = $(testfiles) $(sitemapreader_build)
-
-SiteMapReader_1.1.dll: $(sitemapreader_build)
- $(MCS) -pkg:dotnet -r:System.Xml.dll -target:library -out:$@ $^
View
11 tools/asp_state/Makefile.am
@@ -1,28 +1,19 @@
MCSFLAGS= -debug+ -debug:full -nologo
-aspstatedir = $(prefix)/lib/xsp/1.0
-aspstate_SCRIPTS = asp-state.exe
-aspstate_DATA = asp-state.exe.config
-
-if NET_2_0
scripts2 = asp-state2.exe
data2 = asp-state2.exe.config
-endif
aspstate2dir = $(prefix)/lib/xsp/2.0
aspstate2_SCRIPTS = $(scripts2)
aspstate2_DATA = $(data2)
-EXTRA_DIST = $(aspstate_input) asp-state.exe.config asp-state2.exe.config
+EXTRA_DIST = $(aspstate_input) asp-state2.exe.config
CLEANFILES = *.exe *.mdb
aspstate_input = AssemblyInfo.cs.in \
asp_state.cs
aspstate_sources = $(aspstate_input:.in=)
-asp-state.exe: $(aspstate_sources)
- $(MCS) $(MCSFLAGS) /out:$@ $^
-
asp-state2.exe: $(aspstate_sources)
$(GMCS) $(MCSFLAGS) /out:$@ $^
View
11 tools/dbsessmgr/Makefile.am
@@ -1,28 +1,19 @@
MCSFLAGS= -debug+ -debug:full -nologo
-dbsessmgrdir = $(prefix)/lib/xsp/1.0
-dbsessmgr_SCRIPTS = dbsessmgr.exe
-dbsessmgr_DATA = dbsessmgr.exe.config
-
-if NET_2_0
scripts2 = dbsessmgr2.exe
data2 = dbsessmgr2.exe.config
-endif
dbsessmgr2dir = $(prefix)/lib/xsp/2.0
dbsessmgr2_SCRIPTS = $(scripts2)
dbsessmgr2_DATA = $(data2)
-EXTRA_DIST = $(dbsessmgr_input) dbsessmgr.exe.config dbsessmgr2.exe.config
+EXTRA_DIST = $(dbsessmgr_input) dbsessmgr2.exe.config
CLEANFILES = *.exe *.mdb
dbsessmgr_input = AssemblyInfo.cs.in \
dbsessmgr.cs
dbsessmgr_sources = $(dbsessmgr_input:.in=)
-dbsessmgr.exe: $(dbsessmgr_sources)
- $(MCS) $(MCSFLAGS) -r:System.Data.dll -out:$@ $^
-
dbsessmgr2.exe: $(dbsessmgr_sources)
$(GMCS) $(MCSFLAGS) -r:System.Data.dll -out:$@ $^
View
2 unittests/Tests.XSP.Security/Makefile.am
@@ -12,7 +12,7 @@ unittestsdir = $(pkglibdir)/unittests/Tests.XSP.Security
unittests_DATA = $(security_test_sources) Tests.XSP.Security.dll Makefile
Tests.XSP.Security.dll: $(security_test_sources)
- mcs -debug -pkg:mono-nunit -out:$@ -t:library $(security_test_sources)
+ $(GMCS) -debug -pkg:mono-nunit -out:$@ -t:library $(security_test_sources)
run-test: Tests.XSP.Security.dll
nunit-console Tests.XSP.Security.dll

0 comments on commit 7d9085c

Please sign in to comment.