net-misc/simias: gcc 4.3 / libtool 2.2 / mono 2.2
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@798 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
@@ -0,0 +1,94 @@
|
||||
Index: configure.in
|
||||
===================================================================
|
||||
--- configure.in (Revision 6873)
|
||||
+++ configure.in (Arbeitskopie)
|
||||
@@ -607,8 +607,87 @@
|
||||
# Configure MONO_WEBSERVER
|
||||
#
|
||||
MONO_WEBSERVER="no"
|
||||
-if test -e "/usr/lib/mono/1.0/Mono.WebServer.dll"; then
|
||||
- MONO_WEBSERVER="yes"
|
||||
+if test "$SIMIAS_OS" = "linux"; then
|
||||
+ # If we have xsp in our $PATH, then we have xsp installed
|
||||
+ AC_CHECK_PROG(HAVE_XSP, xsp, yes)
|
||||
+ AC_CHECKING([whether xsp version is >= 1.1.13.8])
|
||||
+ if test "$HAVE_XSP" = "yes"; then
|
||||
+ # Get the version info and check if we have a version >= 1.1.18
|
||||
+ # 1st: Get the version string
|
||||
+ XSP_EXE_VER=`LANG="C" xsp --version | head -n 1 | cut -d" " -f2`
|
||||
+
|
||||
+ # We have to look at a minimum of 3 digits (mono-W.X.Y.Z)
|
||||
+ DIGIT_W=`echo $XSP_EXE_VER | cut -d"." -f1` # major
|
||||
+ DIGIT_X=`echo $XSP_EXE_VER | cut -d"." -f2` # minor
|
||||
+ DIGIT_Y=`echo $XSP_EXE_VER | cut -d"." -f3` # sub
|
||||
+ DIGIT_Z=`echo $XSP_EXE_VER | cut -d"." -f4` # extra
|
||||
+
|
||||
+ # We want to require a minimum of 1.1.18 (no z, setting "0")
|
||||
+ REQ_MAJOR="1"
|
||||
+ REQ_MINOR="1"
|
||||
+ REQ_SUB="13"
|
||||
+ REQ_EXTRA="7"
|
||||
+
|
||||
+ # Lets compare things
|
||||
+ echo " M M S E"
|
||||
+ echo " A I U X"
|
||||
+ echo " J N B T"
|
||||
+ echo " O O R"
|
||||
+ echo " R R A"
|
||||
+ echo " - - - "
|
||||
+ echo "DEBUG $DIGIT_W - $DIGIT_X - $DIGIT_Y - $DIGIT_Z"
|
||||
+ echo "DEBUG $REQ_MAJOR - $REQ_MINOR - $REQ_SUB - $REQ_EXTRA"
|
||||
+
|
||||
+XSP_ERROR_MSG="
|
||||
+* Your xsp version seems to be $DIGIT_W.$DIGIT_X.$DIGIT_Y.$DIGIT_Z
|
||||
+* You need to install xsp >= $REQ_MAJOR.$REQ_MINOR.$REQ_SUB to run simias
|
||||
+"
|
||||
+
|
||||
+ if [[[ -n $DIGIT_W && $DIGIT_W -ge $REQ_MAJOR ]]] ; then
|
||||
+ echo "MAJOR OK"
|
||||
+ # MAJOR IS OK, NOW CHECK MINOR
|
||||
+ if [[[ -n $DIGIT_X && $DIGIT_X -gt $REQ_MINOR ]]] ; then
|
||||
+ echo "MINOR GREATER"
|
||||
+ # MINOR IS GREATER, SKIP CHECK SUB
|
||||
+ MONO_WEBSERVER="yes"
|
||||
+ else
|
||||
+ if [[[ -n $DIGIT_X && $DIGIT_X -eq $REQ_MINOR ]]] ; then
|
||||
+ echo "MINOR EQUAL"
|
||||
+ # MINOR IS EQUAL, CHECK SUB
|
||||
+ if [[[ -n $DIGIT_Y && $DIGIT_Y -gt $REQ_SUB ]]] ; then
|
||||
+ echo "SUB OK"
|
||||
+ # SUB IS GREATER - SKIP CHECK EXTRA
|
||||
+ MONO_WEBSERVER="yes"
|
||||
+ else
|
||||
+ if [[[ -n $DIGIT_Y && $DIGIT_Y -eq $REQ_SUB ]]] ; then
|
||||
+ echo "SUB OK"
|
||||
+ # SUB IS EQUAL, CHECK EXTRA
|
||||
+ if [[[ -n $DIGIT_Z && $DIGIT_Z -ge $REQ_EXTRA ]]] ; then
|
||||
+ echo "EXTRA OK"
|
||||
+ # EXTRA IS GREATER/EQUAL
|
||||
+ MONO_WEBSERVER="yes"
|
||||
+ else
|
||||
+ echo "EXTRA NOT OK !"
|
||||
+ AC_MSG_ERROR($XSP_ERROR_MSG)
|
||||
+ fi
|
||||
+ else
|
||||
+ echo "SUB NOT OK !"
|
||||
+ AC_MSG_ERROR($XSP_ERROR_MSG)
|
||||
+ fi
|
||||
+ fi
|
||||
+ else
|
||||
+ echo "MINOR NOT OK !"
|
||||
+ AC_MSG_ERROR($XSP_ERROR_MSG)
|
||||
+ fi
|
||||
+ fi
|
||||
+ else
|
||||
+ echo "MAJOR NOT OK !"
|
||||
+ AC_MSG_ERROR($XSP_ERROR_MSG)
|
||||
+ fi
|
||||
+ echo "DEBUG MONO_WEBSERVER=yes"
|
||||
+ else
|
||||
+ AC_MSG_ERROR(* xsp command not found)
|
||||
+ fi
|
||||
fi
|
||||
|
||||
AC_SUBST(MONO_WEBSERVER)
|
||||
14
net-misc/simias/files/eval_gacd_mono_webserver_true.diff
Normal file
14
net-misc/simias/files/eval_gacd_mono_webserver_true.diff
Normal file
@@ -0,0 +1,14 @@
|
||||
Index: src/core/SimiasApp/Makefile.am
|
||||
===================================================================
|
||||
--- src/core/SimiasApp/Makefile.am (Revision 6873)
|
||||
+++ src/core/SimiasApp/Makefile.am (Arbeitskopie)
|
||||
@@ -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 \
|
||||
12
net-misc/simias/files/flex_in_lib64.diff
Normal file
12
net-misc/simias/files/flex_in_lib64.diff
Normal file
@@ -0,0 +1,12 @@
|
||||
diff -Naur simias/tools/gsoap/gsoap-linux-2.7/src/Makefile simias-changed/tools/gsoap/gsoap-linux-2.7/src/Makefile
|
||||
--- simias/tools/gsoap/gsoap-linux-2.7/src/Makefile 2007-10-01 22:32:04.000000000 +0200
|
||||
+++ simias-changed/tools/gsoap/gsoap-linux-2.7/src/Makefile 2007-10-02 19:34:26.000000000 +0200
|
||||
@@ -10,7 +10,7 @@
|
||||
YACC=bison
|
||||
# For static linkage with Flex use:
|
||||
ifndef (lib)
|
||||
-lib=lib
|
||||
+lib=lib64
|
||||
endif
|
||||
|
||||
LIBS=/usr/$(lib)/libfl.a
|
||||
80
net-misc/simias/files/simias-1.6.use_system_gsoap.patch
Normal file
80
net-misc/simias/files/simias-1.6.use_system_gsoap.patch
Normal file
@@ -0,0 +1,80 @@
|
||||
diff -uNr simias.orig/Makefile.am simias/Makefile.am
|
||||
--- simias.orig/Makefile.am 2009-02-21 15:54:46.573843452 +0100
|
||||
+++ simias/Makefile.am 2009-02-21 15:55:03.186687971 +0100
|
||||
@@ -7,7 +7,7 @@
|
||||
rm -rf `find $(distdir) -name CVS`
|
||||
rm -rf `find $(distdir) -name ".svn"`
|
||||
|
||||
-EXTRA_DIST = iFolder.snk tools/aclocal tools/gsoap external/libflaim external/log4net external/Mono.WebServer
|
||||
+EXTRA_DIST = iFolder.snk tools/aclocal external/libflaim external/log4net external/Mono.WebServer
|
||||
|
||||
all:
|
||||
|
||||
diff -uNr simias.orig/src/core/libsimias/Makefile.am simias/src/core/libsimias/Makefile.am
|
||||
--- simias.orig/src/core/libsimias/Makefile.am 2009-02-21 15:54:46.492830527 +0100
|
||||
+++ simias/src/core/libsimias/Makefile.am 2009-02-21 15:55:52.874747286 +0100
|
||||
@@ -6,7 +6,6 @@
|
||||
dist-hook:
|
||||
rm -rf `find $(distdir) |grep simiasClientLib.c`
|
||||
rm -rf `find $(distdir) |grep envC.c`
|
||||
- rm -rf `find $(distdir) |grep stdsoap2.c`
|
||||
|
||||
|
||||
lib_LTLIBRARIES = libsimias.la
|
||||
@@ -14,7 +13,7 @@
|
||||
override CFLAGS =
|
||||
|
||||
libsimias_la_SOURCES = \
|
||||
- envC.c simiasClientLib.c stdsoap2.c simias.c simias.h simiasweb.c simiasweb.h
|
||||
+ envC.c simiasClientLib.c simias.c simias.h simiasweb.c simiasweb.h
|
||||
|
||||
libsimias_la_CFLAGS = \
|
||||
$(XML2_CFLAGS) -DWITH_NONAMESPACES -DWITH_COOKIES
|
||||
@@ -22,19 +21,15 @@
|
||||
libsimias_la_LDFLAGS = \
|
||||
$(XML2_LIBS)
|
||||
|
||||
-envC.c: $(srcdir)/stdsoap2.c
|
||||
+envC.c:
|
||||
> $(srcdir)/env.h
|
||||
- $(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
|
||||
+ soapcpp2 -c -penv $(srcdir)/env.h
|
||||
|
||||
-$(srcdir)/stdsoap2.c:
|
||||
- cp $(GSOAP_PATH)/stdsoap2.h $(srcdir)
|
||||
- cp $(GSOAP_PATH)/stdsoap2.c $(srcdir)
|
||||
-
|
||||
-$(srcdir)/libsimias.h: $(srcdir)/stdsoap2.c $(SIMIAS_WSDL)
|
||||
- $(GSOAP_PATH)/wsdl2h -c -o $@ $(SIMIAS_WSDL)
|
||||
+$(srcdir)/libsimias.h: $(SIMIAS_WSDL)
|
||||
+ wsdl2h -c -o $@ $(SIMIAS_WSDL)
|
||||
|
||||
$(srcdir)/simiasClientLib.c: $(srcdir)/libsimias.h
|
||||
- $(GSOAP_PATH)/soapcpp2 -c -n -psimias $(srcdir)/libsimias.h
|
||||
+ soapcpp2 -c -n -psimias $(srcdir)/libsimias.h
|
||||
|
||||
install-exec-hook:
|
||||
if !WINDOWS
|
||||
@@ -46,7 +41,6 @@
|
||||
$(mkinstalldirs) $(DESTDIR)$(includedir)
|
||||
$(INSTALL_PROGRAM) simiasStub.h $(DESTDIR)$(includedir)/simias
|
||||
$(INSTALL_PROGRAM) simias.nsmap $(DESTDIR)$(includedir)/simias
|
||||
- $(INSTALL_PROGRAM) stdsoap2.h $(DESTDIR)$(includedir)/simias
|
||||
$(INSTALL_PROGRAM) simiasH.h $(DESTDIR)$(includedir)/simias
|
||||
$(INSTALL_PROGRAM) simias.h $(DESTDIR)$(includedir)/simias
|
||||
$(INSTALL_PROGRAM) simiasweb.h $(DESTDIR)$(includedir)/simias
|
||||
@@ -54,13 +48,12 @@
|
||||
uninstall-local:
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simiasStub.h
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simias.nsmap
|
||||
- rm -f $(DESTDIR)$(includedir)/simias/stdsoap2.h
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simiasH.h
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simias.h
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simiasweb.h
|
||||
|
||||
clean-local:
|
||||
- rm -f stdsoap2.* *.xml simias.nsmap simiasC* simiasH* simiasS* env* soap*
|
||||
+ rm -f *.xml simias.nsmap simiasC* simiasH* simiasS* env* soap*
|
||||
rm -rf $(COMMON_CLEAN_FILES)
|
||||
|
||||
distclean-local:
|
||||
15
net-misc/simias/files/simias-libflaim_shared-1.patch
Normal file
15
net-misc/simias/files/simias-libflaim_shared-1.patch
Normal file
@@ -0,0 +1,15 @@
|
||||
diff -uNr simias.orig/src/core/FlaimProvider/FlaimWrapper/Makefile.am simias/src/core/FlaimProvider/FlaimWrapper/Makefile.am
|
||||
--- simias.orig/src/core/FlaimProvider/FlaimWrapper/Makefile.am 2007-10-16 17:56:05.000000000 +0200
|
||||
+++ simias/src/core/FlaimProvider/FlaimWrapper/Makefile.am 2009-02-21 13:50:24.654598727 +0100
|
||||
@@ -92,9 +92,9 @@
|
||||
lib=@LIB64@
|
||||
|
||||
# NOTE: The following is a _hack_.
|
||||
-LIBFLAIM_LIBS_HACK = "-lpthread -lrt -lstdc++ -ldl -lncurses /usr/$(lib)/libflaim.a"
|
||||
+# LIBFLAIM_LIBS_HACK = "-lpthread -lrt -lstdc++ -ldl -lncurses /usr/$(lib)/libflaim.a"
|
||||
|
||||
-libFlaimWrapper_la_LDFLAGS = $(LIBFLAIM_LIBS_HACK)
|
||||
+libFlaimWrapper_la_LDFLAGS = $(LIBFLAIM_LIBS)
|
||||
|
||||
install-exec-local: libFlaimWrapper.la
|
||||
$(mkinstalldirs) $(DESTDIR)$(webbindir)
|
||||
18
net-misc/simias/files/simias-libtool22-1.patch
Normal file
18
net-misc/simias/files/simias-libtool22-1.patch
Normal file
@@ -0,0 +1,18 @@
|
||||
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 littool 2.2 aware
|
||||
|
||||
diff -Naur simias.orig/configure.in simias/configure.in
|
||||
--- simias.orig/configure.in 2009-02-21 10:43:03.000000000 +0000
|
||||
+++ simias/configure.in 2009-02-21 11:06:19.641171546 +0000
|
||||
@@ -8,6 +8,7 @@
|
||||
VERSION=$VERSION.$BUILDNUM.1
|
||||
AM_MAINTAINER_MODE
|
||||
AC_PROG_CC
|
||||
+AC_PROG_CXX
|
||||
m4_pattern_allow(PKG_CONFIG)
|
||||
|
||||
#
|
||||
164
net-misc/simias/files/simias-mono22-1.patch
Normal file
164
net-misc/simias/files/simias-mono22-1.patch
Normal file
@@ -0,0 +1,164 @@
|
||||
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
|
||||
{
|
||||
32
net-misc/simias/files/simias_make_gcc43_happy.diff
Normal file
32
net-misc/simias/files/simias_make_gcc43_happy.diff
Normal file
@@ -0,0 +1,32 @@
|
||||
commit 3fd0a202d298e633e00f1756405c82e4b794de25
|
||||
Author: Jan-Simon Möller <dl9pf@legolas.auenland.lan>
|
||||
Date: Tue Aug 19 08:51:41 2008 +0200
|
||||
|
||||
Make gcc4.3 happy (added 2* #include <cstring>)
|
||||
|
||||
Signed-off-by: Jan-Simon Möller <dl9pf@legolas.auenland.lan>
|
||||
|
||||
diff --git a/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp b/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp
|
||||
index d47944d..16f87c0 100644
|
||||
--- a/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp
|
||||
+++ b/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp
|
||||
@@ -21,6 +21,7 @@
|
||||
*
|
||||
***********************************************************************/
|
||||
#include "CSPObjectIterator.h"
|
||||
+#include <cstring>
|
||||
|
||||
CSPObjectIterator::CSPObjectIterator(HFCURSOR cursor, int count, FLMBOOL includeColId) :
|
||||
m_Count(count),
|
||||
diff --git a/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h b/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h
|
||||
index 616435f..58e4f92 100644
|
||||
--- a/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h
|
||||
+++ b/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h
|
||||
@@ -22,6 +22,7 @@
|
||||
***********************************************************************/
|
||||
#ifndef _CSTYPE_H_
|
||||
#define _CSTYPE_H_
|
||||
+#include <cstring>
|
||||
|
||||
#define MAX_INT_STRING 21
|
||||
|
||||
Reference in New Issue
Block a user