219 lines
9.5 KiB
Diff
219 lines
9.5 KiB
Diff
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
|
|
Date: 2009-02-21
|
|
Initial Package Version: 1.6.7303.1
|
|
Origin: me
|
|
Upstream Status: unknown
|
|
Description: make it mono 2 aware
|
|
|
|
diff -Naur simias.orig/configure.in simias/configure.in
|
|
--- simias.orig/configure.in 2009-02-21 11:13:16.000000000 +0000
|
|
+++ simias/configure.in 2009-02-21 11:23:28.589302092 +0000
|
|
@@ -17,22 +17,22 @@
|
|
case $host_os in
|
|
linux*)
|
|
SIMIAS_OS='linux'
|
|
- AC_CHECK_PROG(CSC, mcs, mcs)
|
|
- test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: mcs not found in \$PATH])
|
|
+ AC_CHECK_PROG(CSC, gmcs, gmcs)
|
|
+ test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: gmcs not found in \$PATH])
|
|
PKG_CONFIG_DIR='lib'
|
|
;;
|
|
darwin*)
|
|
SIMIAS_OS='darwin'
|
|
- AC_CHECK_PROG(CSC, mcs, mcs)
|
|
- test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: mcs not found in \$PATH])
|
|
+ AC_CHECK_PROG(CSC, gmcs, gmcs)
|
|
+ test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: gmcs not found in \$PATH])
|
|
export PKG_CONFIG_PATH="/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig:$PKG_CONFIG_PATH"
|
|
PKG_CONFIG_DIR='lib'
|
|
;;
|
|
cygwin*)
|
|
SIMIAS_OS='windows'
|
|
AC_CHECK_PROG(CSC, csc, csc)
|
|
- test -z "$CSC" && AC_CHECK_PROG(CSC, mcs, mcs)
|
|
- test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: neither csc nor mcs found in \$PATH])
|
|
+ test -z "$CSC" && AC_CHECK_PROG(CSC, gmcs, gmcs)
|
|
+ test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: neither csc nor gmcs found in \$PATH])
|
|
PKG_CONFIG_DIR='.'
|
|
;;
|
|
*)
|
|
@@ -43,7 +43,7 @@
|
|
AM_CONDITIONAL(LINUX, test "$SIMIAS_OS" = "linux")
|
|
AM_CONDITIONAL(WINDOWS, test "$SIMIAS_OS" = "windows")
|
|
AM_CONDITIONAL(DARWIN, test "$SIMIAS_OS" = "darwin")
|
|
-AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
|
|
+AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
|
AM_CONDITIONAL(DOTNET, test "$CSC" = "csc")
|
|
|
|
|
|
@@ -116,7 +116,7 @@
|
|
#
|
|
# Mono-specific configuration
|
|
#
|
|
- mcs)
|
|
+ gmcs)
|
|
CSC_EXEFLAG=/target:exe
|
|
CSC_LIBFLAG=/target:library
|
|
CSC_WINEXEFLAG=/target:winexe
|
|
diff -uNr simias.orig/src/admin/Makefile.am simias/src/admin/Makefile.am
|
|
--- simias.orig/src/admin/Makefile.am 2007-10-16 17:55:39.000000000 +0200
|
|
+++ simias/src/admin/Makefile.am 2009-02-21 13:00:37.456573254 +0100
|
|
@@ -128,7 +128,7 @@
|
|
all: Novell.iFolderAdmin.dll
|
|
|
|
iFolderAdminWebProxy.cs: ../webservices/iFolderAdmin.wsdl
|
|
- wsdl /nologo /out:$@ $<
|
|
+ wsdl2 /nologo /out:$@ $<
|
|
|
|
Novell.iFolderAdmin.dll: $(srcdir)/AssemblyInfo.cs iFolderAdminWebProxy.cs $(iFolderAdmin_CSFILES) $(iFolderAdmin_RESOURCES)
|
|
$(CSC) /out:$@ $(CSCFLAGS) $(iFolderAdmin_FLAGS) $(iFolderAdmin_LIBS:%=/r:%) $(iFolderAdmin_RESOURCES:%=/res:%) $(iFolderAdmin_LIBPATH:%=/lib:%) $(srcdir)/AssemblyInfo.cs $(iFolderAdmin_CSFILES_CSC)
|
|
diff -uNr simias.orig/src/core/SimiasClient/Makefile.am simias/src/core/SimiasClient/Makefile.am
|
|
--- simias.orig/src/core/SimiasClient/Makefile.am 2007-10-16 17:55:49.000000000 +0200
|
|
+++ simias/src/core/SimiasClient/Makefile.am 2009-02-21 13:02:44.947848486 +0100
|
|
@@ -31,13 +31,13 @@
|
|
|
|
$(srcdir)/SimiasService.cs: $(srcdir)/../WebService/Simias.wsdl
|
|
if WINDOWS
|
|
- wsdl /out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
|
+ wsdl2 /out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
|
endif
|
|
if LINUX
|
|
- -wsdl -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
|
+ -wsdl2 -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
|
endif
|
|
if DARWIN
|
|
- wsdl -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
|
+ wsdl2 -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
|
endif
|
|
|
|
SimiasClient.dll: $(srcdir)/AssemblyInfo.cs $(SimiasClient_CSFILES) $(SimiasClient_RESOURCES)
|
|
diff -uNr simias.orig/src/reports/Proxy/Makefile.am simias/src/reports/Proxy/Makefile.am
|
|
--- simias.orig/src/reports/Proxy/Makefile.am 2007-10-16 17:56:12.000000000 +0200
|
|
+++ simias/src/reports/Proxy/Makefile.am 2009-02-21 13:00:58.569994200 +0100
|
|
@@ -28,7 +28,7 @@
|
|
all: Novell.iFolder.Enterprise.Reports.Proxy.dll
|
|
|
|
iFolderReportsProxy.cs: ../WebService/iFolderReports.wsdl
|
|
- wsdl /nologo /out:$@ $<
|
|
+ wsdl2 /nologo /out:$@ $<
|
|
|
|
Novell.iFolder.Enterprise.Reports.Proxy.dll: iFolderReportsProxy.cs $(iFolderReportsProxy_CSFILES) $(iFolderReportsProxy_RESOURCES)
|
|
$(CSC) /out:$@ $(CSCFLAGS) $(iFolderReportsProxy_FLAGS) $(iFolderReportsProxy_LIBS:%=/r:%) $(iFolderReportsProxy_LIBPATH:%=/lib:%) $(iFolderReportsProxy_CSFILES_CSC) /doc:iFolderReportsProxy.doc.xml
|
|
diff -uNr simias.orig/src/utils/usercmd/Makefile.am simias/src/utils/usercmd/Makefile.am
|
|
--- simias.orig/src/utils/usercmd/Makefile.am 2007-10-16 17:55:08.000000000 +0200
|
|
+++ simias/src/utils/usercmd/Makefile.am 2009-02-21 13:01:09.111656943 +0100
|
|
@@ -34,7 +34,7 @@
|
|
all: UserCmd.exe
|
|
|
|
AdminService.cs: ../../webservices/iFolderAdmin.wsdl
|
|
- wsdl /nologo /out:$@ $<
|
|
+ wsdl2 /nologo /out:$@ $<
|
|
|
|
UserCmd.exe: $(srcdir)/AssemblyInfo.cs $(UserCmd_CSFILES) $(UserCmd_RESOURCES)
|
|
$(CSC) /out:$@ $(CSCFLAGS) $(UserCmd_FLAGS) $(SIMIAS_LIBS) $(UserCmd_LIBS:%=/r:%) $(UserCmd_LIBPATH:%=/lib:%) $(UserCmd_RESOURCES:%=$(ICON_FLAG)%) $(UserCmd_CSFILES_CSC) $(DOC_FILE_CMD)
|
|
diff -uNr simias.orig/src/webaccess/Makefile.am simias/src/webaccess/Makefile.am
|
|
--- simias.orig/src/webaccess/Makefile.am 2007-10-16 17:55:07.000000000 +0200
|
|
+++ simias/src/webaccess/Makefile.am 2009-02-21 13:01:14.940358254 +0100
|
|
@@ -121,7 +121,7 @@
|
|
all: Novell.iFolderWeb.dll
|
|
|
|
iFolderWebProxy.cs: ../webservices/iFolderWeb.wsdl
|
|
- wsdl /nologo /out:$@ $<
|
|
+ wsdl2 /nologo /out:$@ $<
|
|
|
|
Novell.iFolderWeb.dll: $(srcdir)/AssemblyInfo.cs $(iFolderWeb_CSFILES) $(iFolderWeb_RESOURCES)
|
|
$(CSC) /out:$@ $(CSCFLAGS) $(iFolderWeb_FLAGS) $(iFolderWeb_LIBS:%=/r:%) $(iFolderWeb_RESOURCES:%=/res:%) $(iFolderWeb_LIBPATH:%=/lib:%) $(LOG4NET_LIBS) $(iFolderWeb_CSFILES_CSC) /doc:iFolderWeb.doc.xml
|
|
diff -uNr simias.orig/src/webservices/Makefile.am simias/src/webservices/Makefile.am
|
|
--- simias.orig/src/webservices/Makefile.am 2007-10-16 17:55:15.000000000 +0200
|
|
+++ simias/src/webservices/Makefile.am 2009-02-21 13:04:56.399191235 +0100
|
|
@@ -101,10 +101,10 @@
|
|
cp ../server/Simias.LdapProvider/Simias.LdapProvider.dll .
|
|
|
|
iFolderWebLocalProxy.cs: iFolderWebLocal.wsdl
|
|
- wsdl /nologo /namespace:iFolder.WebService.Web /out:$@ $<
|
|
+ wsdl2 /nologo /namespace:iFolder.WebService.Web /out:$@ $<
|
|
|
|
iFolderAdminLocalProxy.cs: iFolderAdminLocal.wsdl
|
|
- wsdl /nologo /namespace:iFolder.WebService.Admin /out:$@ $<
|
|
+ wsdl2 /nologo /namespace:iFolder.WebService.Admin /out:$@ $<
|
|
|
|
iFolderWebLocal.wsdl: copy iFolder.WebService.Local.dll GenerateWsdl.exe
|
|
$(MONO) GenerateWsdl.exe iFolder.WebService.Local.dll iFolder.WebService.iFolderWebLocal http://127.0.0.1:8086/simias10/iFolderWebLocal.asmx $@
|
|
diff -uNr simias.orig/src/core/Notifications/Notification.cs simias/src/core/Notifications/Notification.cs.
|
|
--- simias.orig/src/core/Notifications/Notification.cs 2007-10-16 17:56:09.000000000 +0200
|
|
+++ simias/src/core/Notifications/Notification.cs 2009-02-21 13:28:38.493601028 +0100
|
|
@@ -33,6 +33,8 @@
|
|
using Simias.Service;
|
|
using Simias.Sync;
|
|
|
|
+using Action = Simias.Client.Event.Action;
|
|
+
|
|
namespace Simias.Storage
|
|
{
|
|
/// <summary>
|
|
diff -uNr simias.orig/src/core/Sync/SyncClient.cs simias/src/core/Sync/SyncClient.cs
|
|
--- simias.orig/src/core/Sync/SyncClient.cs 2007-10-16 18:10:06.000000000 +0200
|
|
+++ simias/src/core/Sync/SyncClient.cs 2009-02-21 13:37:17.039134110 +0100
|
|
@@ -39,6 +39,7 @@
|
|
using Simias.Client.Event;
|
|
using Simias.DomainServices;
|
|
|
|
+using Action = Simias.Client.Event.Action;
|
|
|
|
namespace Simias.Sync
|
|
{
|
|
diff -uNr simias.orig/src/core/WebService/mono.server.web.config simias/src/core/WebService/mono.server.web.config
|
|
--- simias.orig/src/core/WebService/mono.server.web.config 2009-02-27 21:39:43.937796032 +0100
|
|
+++ simias/src/core/WebService/mono.server.web.config 2009-02-27 21:41:30.872940869 +0100
|
|
@@ -38,12 +38,6 @@
|
|
|
|
</system.web>
|
|
|
|
- <system.net>
|
|
- <connectionManagement>
|
|
- <add address="*" maxconnection="10" />
|
|
- </connectionManagement>
|
|
- </system.net>
|
|
-
|
|
<!--
|
|
<mono.aspnet>
|
|
<acceptEncoding>
|
|
diff -uNr simias.orig/src/core/WebService/mono.web.config simias/src/core/WebService/mono.web.config
|
|
--- simias.orig/src/core/WebService/mono.web.config 2009-02-27 21:39:43.937796032 +0100
|
|
+++ simias/src/core/WebService/mono.web.config 2009-02-27 21:40:51.532681719 +0100
|
|
@@ -33,12 +33,6 @@
|
|
|
|
</system.web>
|
|
|
|
- <system.net>
|
|
- <connectionManagement>
|
|
- <add address="*" maxconnection="10" />
|
|
- </connectionManagement>
|
|
- </system.net>
|
|
-
|
|
<!--
|
|
<mono.aspnet>
|
|
<acceptEncoding>
|
|
diff -uNr simias.orig/src/core/SimiasApp/Makefile.am simias/src/core/SimiasApp/Makefile.am
|
|
--- simias.orig/src/core/SimiasApp/Makefile.am 2009-02-28 07:42:46.297742303 +0100
|
|
+++ simias/src/core/SimiasApp/Makefile.am 2009-02-28 07:47:42.471249900 +0100
|
|
@@ -7,7 +7,8 @@
|
|
SYSTEM_INSTALLER_LIB =
|
|
endif
|
|
|
|
-MONO_WEBSERVER_PATH = ../../../external/Mono.WebServer
|
|
+$(GACD_MONO_WEBSERVER_FALSE) MONO_WEBSERVER_PATH = ../../../external/Mono.WebServer
|
|
+$(GACD_MONO_WEBSERVER_TRUE) MONO_WEBSERVER_PATH = $(MONO_PATH)
|
|
|
|
Simias_CSFILES = $(srcdir)/AssemblyInfo.cs \
|
|
$(srcdir)/Simias.cs \
|
|
@@ -17,7 +17,7 @@
|
|
Simias_INCLUDES =
|
|
Simias_RESOURCES = $(srcdir)/App$(ICON_EXT)
|
|
Simias_FLAGS = $(CSC_EXEFLAG)
|
|
-Simias_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll $(SYSTEM_INSTALLER_LIB) SimiasClient.dll Mono.WebServer.dll
|
|
+Simias_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll $(SYSTEM_INSTALLER_LIB) SimiasClient.dll Mono.WebServer2.dll
|
|
Simias_LIBPATH = ../SimiasClient $(MONO_WEBSERVER_PATH)
|
|
|
|
EXTRA_DIST = App.ico $(Simias_CSFILES) AssemblyInfo.cs.in
|