155 lines
7.3 KiB
Diff
155 lines
7.3 KiB
Diff
|
diff -uNr simias.orig/configure.in simias/configure.in
|
||
|
|
--- simias.orig/configure.in 2009-04-06 11:03:00.061800856 +0200
|
||
|
|
+++ simias/configure.in 2009-04-06 11:03:46.480191295 +0200
|
||
|
|
@@ -18,8 +18,8 @@
|
||
|
|
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="$LIB64"
|
||
|
|
AC_CHECK_PROG(CSC2, gmcs, gmcs)
|
||
|
|
test -z "$CSC" && AC_MSG_ERROR([no C Sharp .Net 2.0 compiler: gmcs not found in \$PATH])
|
||
|
|
@@ -48,7 +48,7 @@
|
||
|
|
AM_CONDITIONAL(WINDOWS, test "$SIMIAS_OS" = "windows")
|
||
|
|
AM_CONDITIONAL(DARWIN, test "$SIMIAS_OS" = "darwin")
|
||
|
|
AM_CONDITIONAL(DARWIN_X86, test "$host_cpu" = "i686")
|
||
|
|
-AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
|
||
|
|
+AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
||
|
|
AM_CONDITIONAL(DOTNET, test "$CSC" = "csc")
|
||
|
|
|
||
|
|
|
||
|
|
@@ -121,7 +121,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 2009-04-06 11:03:00.057171272 +0200
|
||
|
|
+++ simias/src/admin/Makefile.am 2009-04-06 11:05:12.318699017 +0200
|
||
|
|
@@ -141,7 +141,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) $(LOG4NET_LIBS)
|
||
|
|
diff -uNr simias.orig/src/core/Notifications/Notification.cs simias/src/core/Notifications/Notification.cs
|
||
|
|
--- simias.orig/src/core/Notifications/Notification.cs 2009-04-06 11:02:59.987723103 +0200
|
||
|
|
+++ simias/src/core/Notifications/Notification.cs 2009-04-06 11:16:49.596233553 +0200
|
||
|
|
@@ -43,6 +43,8 @@
|
||
|
|
using Simias.Service;
|
||
|
|
using Simias.Sync;
|
||
|
|
|
||
|
|
+using Action = Simias.Client.Event.Action;
|
||
|
|
+
|
||
|
|
namespace Simias.Storage
|
||
|
|
{
|
||
|
|
/// <summary>
|
||
|
|
diff -uNr simias.orig/src/core/SimiasApp/Makefile.am simias/src/core/SimiasApp/Makefile.am
|
||
|
|
--- simias.orig/src/core/SimiasApp/Makefile.am 2009-04-06 11:02:59.985412467 +0200
|
||
|
|
+++ simias/src/core/SimiasApp/Makefile.am 2009-04-06 11:12:44.117150083 +0200
|
||
|
|
@@ -7,7 +7,8 @@
|
||
|
|
SYSTEM_INSTALLER_LIB =
|
||
|
|
endif
|
||
|
|
|
||
|
|
-MONO_WEBSERVER_PATH = ../../../dependencies/external/Mono.WebServer
|
||
|
|
+$(GACD_MONO_WEBSERVER_FALSE) MONO_WEBSERVER_PATH = ../../../dependencies/external/Mono.WebServer
|
||
|
|
+$(GACD_MONO_WEBSERVER_TRUE) MONO_WEBSERVER_PATH = $(MONO_PATH)
|
||
|
|
|
||
|
|
Simias_CSFILES = $(srcdir)/Simias.cs \
|
||
|
|
$(srcdir)/SimiasAppInstallerClass.cs
|
||
|
|
@@ -16,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
|
||
|
|
diff -uNr simias.orig/src/core/SimiasClient/Makefile.am simias/src/core/SimiasClient/Makefile.am
|
||
|
|
--- simias.orig/src/core/SimiasClient/Makefile.am 2009-04-06 11:02:59.983094008 +0200
|
||
|
|
+++ simias/src/core/SimiasClient/Makefile.am 2009-04-06 11:08:43.841779002 +0200
|
||
|
|
@@ -34,7 +34,7 @@
|
||
|
|
wsdl /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
|
||
|
|
diff -uNr simias.orig/src/core/Sync/SyncClient.cs simias/src/core/Sync/SyncClient.cs
|
||
|
|
--- simias.orig/src/core/Sync/SyncClient.cs 2009-04-06 11:02:59.994671636 +0200
|
||
|
|
+++ simias/src/core/Sync/SyncClient.cs 2009-04-06 11:17:24.656406387 +0200
|
||
|
|
@@ -48,7 +48,7 @@
|
||
|
|
using Simias.Client.Event;
|
||
|
|
using Simias.DomainServices;
|
||
|
|
|
||
|
|
-
|
||
|
|
+using Action = Simias.Client.Event.Action;
|
||
|
|
|
||
|
|
namespace Simias.Sync
|
||
|
|
{
|
||
|
|
diff -uNr simias.orig/src/reports/Proxy/Makefile.am simias/src/reports/Proxy/Makefile.am
|
||
|
|
--- simias.orig/src/reports/Proxy/Makefile.am 2009-04-06 11:03:00.022445721 +0200
|
||
|
|
+++ simias/src/reports/Proxy/Makefile.am 2009-04-06 11:05:39.207006205 +0200
|
||
|
|
@@ -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 2009-04-06 11:03:00.022445721 +0200
|
||
|
|
+++ simias/src/utils/usercmd/Makefile.am 2009-04-06 11:05:59.938476129 +0200
|
||
|
|
@@ -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 2009-04-06 11:03:00.020130196 +0200
|
||
|
|
+++ simias/src/webaccess/Makefile.am 2009-04-06 11:06:08.061160358 +0200
|
||
|
|
@@ -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 2009-04-06 11:02:59.966891195 +0200
|
||
|
|
+++ simias/src/webservices/Makefile.am 2009-04-06 11:09:21.894426864 +0200
|
||
|
|
@@ -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 $@
|