Hello everyone,
Finally, I could malloc() some time to work on Makefiles of both simias
and ifolder so that they generate (successfully) a usable tarball.
So here you go - two patches for the Makefiles - one each for simias and
ifolder.
Notable changes made to configure.in of both simias and ifolder:
* Moved AM_INIT_AUTOMAKE arguments to AC_INIT, since
AM_INIT_AUTOMAKE's usage to define the module name and version
has been obsoleted by AC_INIT
* Changed the tarball format from v7 to ustar. The maximum length
of a file name is limited to 99 characters in v7 and because of
this, some of the files were not getting bundled.
Note: I've tested these patches to the best of my ability (and
requirements ;). It would be great if someone could test these patches
in environments where more than "--prefix" option is passed
to ./configure.
Please review these patches and let me know if you need any information.
Thanks,
Srinidhi.
--
ASCII ribbon campaign ( ) B S Srinidhi
- against HTML email X http://www.srinidhi-is.in
& vCards / \ Bangalore
Index: configure.in
===================================================================
--- configure.in (revision 6753)
+++ configure.in (working copy)
@@ -1,6 +1,7 @@
-AC_INIT(src/core/Common/Configuration.cs)
+AC_INIT(simias, 1.5)
+AC_CONFIG_SRCDIR(src/core/Common/Configuration.cs)
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(simias, 1.5)
+AM_INIT_AUTOMAKE([tar-ustar])
# Check to see if the BUILDNUM is set by global build
if test "$BUILDNUM" = ""; then
let "BUILDNUM=`date +%G%j`-2000000"
Index: src/webaccess/Makefile.am
===================================================================
--- src/webaccess/Makefile.am (revision 6753)
+++ src/webaccess/Makefile.am (working copy)
@@ -1,166 +1,168 @@
-# handle Mono secondary dependencies
-export MONO_PATH := $(MONO_PATH)
-
-iFolderWeb_CSFILES = \
- $(srcdir)/AssemblyInfo.cs \
- $(srcdir)/Default.aspx.cs \
- $(srcdir)/Download.ashx.cs \
- $(srcdir)/Browse.aspx.cs \
- $(srcdir)/Search.aspx.cs \
- $(srcdir)/NewFolder.aspx.cs \
- $(srcdir)/Upload.aspx.cs \
- $(srcdir)/ItemHistory.aspx.cs \
- $(srcdir)/Error.aspx.cs \
- $(srcdir)/Quota.ascx.cs \
- $(srcdir)/Global.asax.cs \
- $(srcdir)/Header.ascx.cs \
- $(srcdir)/Details.aspx.cs \
- $(srcdir)/History.aspx.cs \
- $(srcdir)/Members.aspx.cs \
- $(srcdir)/iFolders.aspx.cs \
- $(srcdir)/iFolderWebProxy.cs \
- $(srcdir)/Login.aspx.cs \
- $(srcdir)/Message.ascx.cs \
- $(srcdir)/Pagging.ascx.cs \
- $(srcdir)/HomeContext.ascx.cs \
- $(srcdir)/iFolderActions.ascx.cs \
- $(srcdir)/iFolderContext.ascx.cs \
- $(srcdir)/TabControl.ascx.cs \
- $(srcdir)/Share.aspx.cs \
- $(srcdir)/iFolderNew.aspx.cs \
- $(srcdir)/iFolderEdit.aspx.cs \
- $(srcdir)/Settings.aspx.cs \
- $(srcdir)/UploadModule.cs \
- $(srcdir)/UploadStream.cs \
- $(srcdir)/WebLogger.cs \
- $(srcdir)/iFolderCertificate.aspx.cs \
- $(srcdir)/WebSettings.cs \
- $(srcdir)/WebUtility.cs
-# $(srcdir)/../core/Encryption/Blowfish.cs
-
-
-iFolderWeb_CSFILES_CSC := $(subst /,$(SEP),$(iFolderWeb_CSFILES))
-
-iFolderWeb_INCLUDES =
-
-iFolderWeb_RESX = \
- $(srcdir)/iFolderWeb.resx \
- $(shell ls $(srcdir)/iFolderWeb.*.resx)
-
-iFolderWeb_RESOURCES := $(iFolderWeb_RESX:$(srcdir)/%.resx=$(srcdir)/Novell.iFolderApp.Web.%.resources)
-
-iFolderWeb_FLAGS = $(CSC_LIBFLAG)
-
-iFolderWeb_LIBS = \
- System.dll \
- System.Data.dll \
- $(SYSTEM_XML) \
- System.Drawing.dll \
- System.Web.dll \
- System.Web.Services.dll \
- $(srcdir)/../core/SimiasLib.dll/SimiasLib.dll
-#if !LINUX
-# iFolderWeb_LIBS := $(iFolderWeb_LIBS) log4net.dll
-#endif
-
-iFolderWeb_LIBPATH = $(LOG4NET_DIR)
-
-iFolderWeb_FORMS = \
- Global.asax \
- Default.aspx \
- Browse.aspx \
- Search.aspx \
- NewFolder.aspx \
- Upload.aspx \
- ItemHistory.aspx \
- Error.aspx \
- Details.aspx \
- History.aspx \
- Members.aspx \
- iFolders.aspx \
- Login.aspx \
- iFolderNew.aspx \
- iFolderEdit.aspx \
- Share.aspx \
- Settings.aspx \
- iFolderCertificate.aspx \
- Quota.ascx \
- Header.ascx \
- Message.ascx \
- Pagging.ascx \
- HomeContext.ascx \
- iFolderContext.ascx \
- iFolderActions.ascx \
- TabControl.ascx \
- Download.ashx \
- Log4Net.config \
- Web.config
-
-EXTRA_DIST = AssemblyInfo.cs.in Log4Net.config.in $(iFolderWeb_CSFILES) $(iFolderWeb_FORMS) images css js help $(iFolderWeb_RESX)
-
-dist-hook:
- rm -rf `find $(distdir)/images -name .svn`
- rm -rf `find $(distdir)/css -name .svn`
- rm -rf `find $(distdir)/js -name .svn`
- rm -rf `find $(distdir)/help -name .svn`
-
-if DEBUG
-if WINDOWS
-DEBUG_FILES = Novell.iFolderWeb.pdb
-endif
-endif
-
-CLEAN_FILES = Novell.iFolderWeb.dll \
- Novell.iFolderWeb.doc.xml \
- $(iFolderWeb_RESOURCES) \
- $(srcdir)/iFolderWebProxy.cs \
- $(DEBUG_FILES)
-
-all: Novell.iFolderWeb.dll
-
-iFolderWebProxy.cs: ../webservices/iFolderWeb.wsdl
- wsdl /nologo /out:$@ $<
-
-Novell.iFolderWeb.dll: $(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
-
-Novell.iFolderApp.Web.%.resources : %.resx
- $(RESGEN) $< $@
-
-install-exec-local: all
- rm -rf $(DESTDIR)$(webaccessdir)
- $(mkinstalldirs) $(DESTDIR)$(webaccessdir)
- $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/bin
- $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/images
- $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/help
- $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/css
- $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/js
- $(INSTALL_PROGRAM) $(iFolderWeb_FORMS) $(DESTDIR)$(webaccessdir)
- $(INSTALL_PROGRAM) Novell.iFolderWeb.dll $(DEBUG_FILES) $(DESTDIR)$(webaccessdir)/bin
- $(INSTALL_PROGRAM) $(srcdir)/css/*.css $(DESTDIR)$(webaccessdir)/css
- $(INSTALL_PROGRAM) $(srcdir)/js/*.js $(DESTDIR)$(webaccessdir)/js
- cd $(srcdir)/help; cp -r * $(DESTDIR)$(webaccessdir)/help
- rm -rf `find $(DESTDIR)$(webaccessdir)/help -name .svn`
- cd $(srcdir)/images; cp -r * $(DESTDIR)$(webaccessdir)/images
- rm -rf `find $(DESTDIR)$(webaccessdir)/images -name .svn`
- ln -sf $(DESTDIR)$(webaccessdir)/../web/bin/SimiasLib.dll $(DESTDIR)$(webaccessdir)/bin
-#if !LINUX
-# $(INSTALL_PROGRAM) $(LOG4NET_DIR)/log4net.dll $(DESTDIR)$(webaccessdir)/bin
-#endif
-
-uninstall-local:
- rm -rf $(DESTDIR)$(webaccessdir)
-
-installcheck-local: install
-
-clean-local:
- rm -rf $(CLEAN_FILES) $(COMMON_CLEAN_FILES)
-
-distclean-local:
- rm -rf $(COMMON_DISTCLEAN_FILES)
-
-maintainer-clean-local:
- rm -rf $(COMMON_MAINTAINER_CLEAN_FILES)
- rm -rf AssemblyInfo.cs
- rm -rf Log4Net.config
-
+# handle Mono secondary dependencies
+export MONO_PATH := $(MONO_PATH)
+
+iFolderWeb_CSFILES = \
+ $(srcdir)/AssemblyInfo.cs \
+ $(srcdir)/Default.aspx.cs \
+ $(srcdir)/Download.ashx.cs \
+ $(srcdir)/Browse.aspx.cs \
+ $(srcdir)/Search.aspx.cs \
+ $(srcdir)/NewFolder.aspx.cs \
+ $(srcdir)/Upload.aspx.cs \
+ $(srcdir)/ItemHistory.aspx.cs \
+ $(srcdir)/Error.aspx.cs \
+ $(srcdir)/Quota.ascx.cs \
+ $(srcdir)/Global.asax.cs \
+ $(srcdir)/Header.ascx.cs \
+ $(srcdir)/Details.aspx.cs \
+ $(srcdir)/History.aspx.cs \
+ $(srcdir)/Members.aspx.cs \
+ $(srcdir)/iFolders.aspx.cs \
+ $(srcdir)/Login.aspx.cs \
+ $(srcdir)/Message.ascx.cs \
+ $(srcdir)/Pagging.ascx.cs \
+ $(srcdir)/HomeContext.ascx.cs \
+ $(srcdir)/iFolderActions.ascx.cs \
+ $(srcdir)/iFolderContext.ascx.cs \
+ $(srcdir)/TabControl.ascx.cs \
+ $(srcdir)/Share.aspx.cs \
+ $(srcdir)/iFolderNew.aspx.cs \
+ $(srcdir)/iFolderEdit.aspx.cs \
+ $(srcdir)/Settings.aspx.cs \
+ $(srcdir)/UploadModule.cs \
+ $(srcdir)/UploadStream.cs \
+ $(srcdir)/WebLogger.cs \
+ $(srcdir)/iFolderCertificate.aspx.cs \
+ $(srcdir)/WebSettings.cs \
+ $(srcdir)/WebUtility.cs
+# $(srcdir)/../core/Encryption/Blowfish.cs
+
+if !SIMIAS_AS_CLIENT
+iFolderWeb_CSFILES += $(srcdir)/iFolderWebProxy.cs
+endif
+
+iFolderWeb_CSFILES_CSC := $(subst /,$(SEP),$(iFolderWeb_CSFILES))
+
+iFolderWeb_INCLUDES =
+
+iFolderWeb_RESX = \
+ $(srcdir)/iFolderWeb.resx \
+ $(shell ls $(srcdir)/iFolderWeb.*.resx)
+
+iFolderWeb_RESOURCES := $(iFolderWeb_RESX:$(srcdir)/%.resx=$(srcdir)/Novell.iFolderApp.Web.%.resources)
+
+iFolderWeb_FLAGS = $(CSC_LIBFLAG)
+
+iFolderWeb_LIBS = \
+ System.dll \
+ System.Data.dll \
+ $(SYSTEM_XML) \
+ System.Drawing.dll \
+ System.Web.dll \
+ System.Web.Services.dll \
+ $(srcdir)/../core/SimiasLib.dll/SimiasLib.dll
+#if !LINUX
+# iFolderWeb_LIBS := $(iFolderWeb_LIBS) log4net.dll
+#endif
+
+iFolderWeb_LIBPATH = $(LOG4NET_DIR)
+
+iFolderWeb_FORMS = \
+ Global.asax \
+ Default.aspx \
+ Browse.aspx \
+ Search.aspx \
+ NewFolder.aspx \
+ Upload.aspx \
+ ItemHistory.aspx \
+ Error.aspx \
+ Details.aspx \
+ History.aspx \
+ Members.aspx \
+ iFolders.aspx \
+ Login.aspx \
+ iFolderNew.aspx \
+ iFolderEdit.aspx \
+ Share.aspx \
+ Settings.aspx \
+ iFolderCertificate.aspx \
+ Quota.ascx \
+ Header.ascx \
+ Message.ascx \
+ Pagging.ascx \
+ HomeContext.ascx \
+ iFolderContext.ascx \
+ iFolderActions.ascx \
+ TabControl.ascx \
+ Download.ashx \
+ Log4Net.config \
+ Web.config
+
+EXTRA_DIST = AssemblyInfo.cs.in Log4Net.config.in $(iFolderWeb_CSFILES) $(iFolderWeb_FORMS) images css js help $(iFolderWeb_RESX)
+
+dist-hook:
+ rm -rf `find $(distdir)/images -name .svn`
+ rm -rf `find $(distdir)/css -name .svn`
+ rm -rf `find $(distdir)/js -name .svn`
+ rm -rf `find $(distdir)/help -name .svn`
+
+if DEBUG
+if WINDOWS
+DEBUG_FILES = Novell.iFolderWeb.pdb
+endif
+endif
+
+CLEAN_FILES = Novell.iFolderWeb.dll \
+ Novell.iFolderWeb.doc.xml \
+ $(iFolderWeb_RESOURCES) \
+ $(srcdir)/iFolderWebProxy.cs \
+ $(DEBUG_FILES)
+
+all: Novell.iFolderWeb.dll
+
+iFolderWebProxy.cs: ../webservices/iFolderWeb.wsdl
+ wsdl /nologo /out:$@ $<
+
+Novell.iFolderWeb.dll: $(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
+
+Novell.iFolderApp.Web.%.resources : %.resx
+ $(RESGEN) $< $@
+
+install-exec-local: all
+ rm -rf $(DESTDIR)$(webaccessdir)
+ $(mkinstalldirs) $(DESTDIR)$(webaccessdir)
+ $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/bin
+ $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/images
+ $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/help
+ $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/css
+ $(mkinstalldirs) $(DESTDIR)$(webaccessdir)/js
+ $(INSTALL_PROGRAM) $(iFolderWeb_FORMS) $(DESTDIR)$(webaccessdir)
+ $(INSTALL_PROGRAM) Novell.iFolderWeb.dll $(DEBUG_FILES) $(DESTDIR)$(webaccessdir)/bin
+ $(INSTALL_PROGRAM) $(srcdir)/css/*.css $(DESTDIR)$(webaccessdir)/css
+ $(INSTALL_PROGRAM) $(srcdir)/js/*.js $(DESTDIR)$(webaccessdir)/js
+ cd $(srcdir)/help; cp -r * $(DESTDIR)$(webaccessdir)/help
+ rm -rf `find $(DESTDIR)$(webaccessdir)/help -name .svn`
+ cd $(srcdir)/images; cp -r * $(DESTDIR)$(webaccessdir)/images
+ rm -rf `find $(DESTDIR)$(webaccessdir)/images -name .svn`
+ ln -sf $(DESTDIR)$(webaccessdir)/../web/bin/SimiasLib.dll $(DESTDIR)$(webaccessdir)/bin
+#if !LINUX
+# $(INSTALL_PROGRAM) $(LOG4NET_DIR)/log4net.dll $(DESTDIR)$(webaccessdir)/bin
+#endif
+
+uninstall-local:
+ rm -rf $(DESTDIR)$(webaccessdir)
+
+installcheck-local: install
+
+clean-local:
+ rm -rf $(CLEAN_FILES) $(COMMON_CLEAN_FILES)
+
+distclean-local:
+ rm -rf $(COMMON_DISTCLEAN_FILES)
+
+maintainer-clean-local:
+ rm -rf $(COMMON_MAINTAINER_CLEAN_FILES)
+ rm -rf AssemblyInfo.cs
+ rm -rf Log4Net.config
+
Index: src/utils/usercmd/Makefile.am
===================================================================
--- src/utils/usercmd/Makefile.am (revision 6753)
+++ src/utils/usercmd/Makefile.am (working copy)
@@ -3,9 +3,12 @@
UserCmd_CSFILES = \
$(srcdir)/AssemblyInfo.cs \
- $(srcdir)/Main.cs \
- $(srcdir)/AdminService.cs
+ $(srcdir)/Main.cs
+if !SIMIAS_AS_CLIENT
+UserCmd_CSFILES += $(srcdir)/AdminService.cs
+endif
+
UserCmd_CSFILES_CSC := $(subst /,$(SEP),$(UserCmd_CSFILES))
UserCmd_INCLUDES =
UserCmd_RESOURCES =
@@ -36,7 +39,11 @@
DOC_FILE_CLEAN = *.doc.xml
endif
+if SIMIAS_AS_CLIENT
+all:
+else
all: UserCmd.exe
+endif
AdminService.cs: ../../webservices/iFolderAdmin.wsdl
wsdl /nologo /out:$@ $<
Index: src/webservices/Makefile.am
===================================================================
--- src/webservices/Makefile.am (revision 6753)
+++ src/webservices/Makefile.am (working copy)
@@ -45,9 +45,14 @@
iFolderWebService_CSFILES = \
$(srcdir)/AssemblyInfo.cs \
$(srcdir)/iFolderAdmin.asmx.cs \
- $(srcdir)/iFolderWeb.asmx.cs \
+ $(srcdir)/iFolderWeb.asmx.cs
+
+if !SIMIAS_AS_CLIENT
+iFolderWebService_CSFILES += \
$(srcdir)/iFolderAdminLocalProxy.cs \
$(srcdir)/iFolderWebLocalProxy.cs
+
+endif
iFolderWebService_WEBFILES = \
$(srcdir)/iFolderAdmin.asmx \
@@ -62,6 +67,7 @@
else
iFolderWebServiceLocal_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll System.Web.Services.dll SimiasLib.dll SimiasClient.dll Simias.Server.dll log4net.dll
endif
+
iFolderWebServiceLocal_LIBPATH = $(LOG4NET_DIR) ../core/SimiasClient ../core/SimiasLib.dll ../server/Simias.Server
GenerateWsdl_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll System.Web.Services.dll
@@ -77,7 +83,7 @@
endif
iFolderWebService_LIBPATH = $(LOG4NET_DIR) ../core/SimiasClient ../core/SimiasLib.dll ../server/Simias.Server
-EXTRA_DIST = AssemblyInfo.cs.in $(iFolderWebServiceLocal_WEBFILES) $(iFolderWebServiceLocal_CSFILES)
+EXTRA_DIST = AssemblyInfo.cs.in $(iFolderWebServiceLocal_WEBFILES) $(iFolderWebServiceLocal_CSFILES) $(iFolderWebService_CSFILES) $(iFolderWebService_WEBFILES) GenerateWsdl.cs
if MAKE_DOC_FILE
DOC_FILE = $(basename $@).doc.xml
@@ -85,7 +91,11 @@
DOC_FILE_CLEAN = *.doc.xml
endif
+if SIMIAS_AS_CLIENT
+all:
+else
all: iFolder.WebService.dll GenerateWsdl.exe iFolderAdmin.wsdl iFolderWeb.wsdl
+endif
iFolder.WebService.Local.dll: copy $(iFolderWebServiceLocal_CSFILES) $(iFolderWebServiceLocal_RESOURCES)
$(CSC) /out:$@ $(CSCFLAGS) $(iFolderWebServiceLocal_FLAGS) $(iFolderWebServiceLocal_LIBS:%=/r:%) $(iFolderWebServiceLocal_LIBPATH:%=/lib:%) $(LOG4NET_LIBS) $(iFolderWebServiceLocal_RESOURCES:%=$(ICON_FLAG)%) $(iFolderWebServiceLocal_CSFILES_CSC)
@@ -96,10 +106,14 @@
GenerateWsdl.exe: GenerateWsdl.cs
$(CSC) /out:$@ $(CSCFLAGS) $(CSC_EXEFLAG) $(GenerateWsdl_LIBS:%=/r:%) $<
+if SIMIAS_AS_CLIENT
copy:
+else
+copy:
cp ../core/SimiasClient/SimiasClient.dll .
cp ../core/SimiasLib.dll/SimiasLib.dll .
cp ../server/Simias.Server/Simias.Server.dll .
+endif
iFolderWebLocalProxy.cs: iFolderWebLocal.wsdl
wsdl /nologo /namespace:iFolder.WebService.Web /out:$@ $<
Index: src/server/Makefile.am
===================================================================
--- src/server/Makefile.am (revision 6753)
+++ src/server/Makefile.am (working copy)
@@ -1,6 +1,6 @@
SUBDIRS = Simias.Server Simias.HostService Simias.HttpFile Simias.Rss Simias.LdapProvider Simias.ADLdapProvider Simias.OpenLdapProvider Simias.ClientUpdate setup DiscoveryWS
-DIST_SUBDIRS = $(SUBDIRS) setup
+DIST_SUBDIRS = $(SUBDIRS)
# handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH):$(DESTDIR)$(libdir)
Index: src/admin/Makefile.am
===================================================================
--- src/admin/Makefile.am (revision 6753)
+++ src/admin/Makefile.am (working copy)
@@ -1,172 +1,175 @@
-# handle Mono secondary dependencies
-export MONO_PATH := $(MONO_PATH)
-iFolderAdmin_CSFILES = \
- $(srcdir)/AccountEnabled.ascx.cs \
- $(srcdir)/AssemblyInfo.cs \
- $(srcdir)/CreateiFolder.aspx.cs \
- $(srcdir)/CreateUser.aspx.cs \
- $(srcdir)/Default.aspx.cs \
- $(srcdir)/DiskSpaceQuota.ascx.cs \
- $(srcdir)/SecurityState.ascx.cs \
- $(srcdir)/Error.aspx.cs \
- $(srcdir)/FileSizeFilter.ascx.cs \
- $(srcdir)/FileTypeFilter.ascx.cs \
- $(srcdir)/Footer.ascx.cs \
- $(srcdir)/Global.asax.cs \
- $(srcdir)/Header.ascx.cs \
- $(srcdir)/iFolderAdminPage.aspx.cs \
- $(srcdir)/iFolderAdminWebProxy.cs \
- $(srcdir)/iFolderDetailsPage.aspx.cs \
- $(srcdir)/iFolderEnabled.ascx.cs \
- $(srcdir)/iFolders.aspx.cs \
- $(srcdir)/iFolderSearch.ascx.cs \
- $(srcdir)/iFolderWebLogger.cs \
- $(srcdir)/ListFooter.ascx.cs \
- $(srcdir)/Login.aspx.cs \
- $(srcdir)/LogTailHandler.ashx.cs \
- $(srcdir)/MemberSearch.ascx.cs \
- $(srcdir)/MemberSelect.aspx.cs \
- $(srcdir)/OwnerSelect.aspx.cs \
- $(srcdir)/Policy.ascx.cs \
- $(srcdir)/ReportLogHandler.ashx.cs \
- $(srcdir)/Reports.aspx.cs \
- $(srcdir)/ServerDetails.aspx.cs \
- $(srcdir)/Servers.aspx.cs \
- $(srcdir)/SyncInterval.ascx.cs \
- $(srcdir)/SystemInfo.aspx.cs \
- $(srcdir)/TopNavigation.ascx.cs \
- $(srcdir)/UserDetails.aspx.cs \
- $(srcdir)/Users.aspx.cs \
- $(srcdir)/Utils.cs
-
-iFolderAdmin_CSFILES_CSC := $(subst /,$(SEP),$(iFolderAdmin_CSFILES))
-
-iFolderAdmin_INCLUDES =
-
-iFolderAdmin_RESX = \
- $(srcdir)/iFolderAdmin.resx
-# $(shell ls $(srcdir)/iFolderAdmin.*.resx)
-
-iFolderAdmin_RESOURCES := $(iFolderAdmin_RESX:$(srcdir)/%.resx=$(srcdir)/Novell.iFolderWeb.Admin.%.resources)
-
-iFolderAdmin_FLAGS = $(CSC_LIBFLAG)
-
-iFolderAdmin_LIBS = \
- System.dll \
- System.Data.dll \
- $(SYSTEM_XML) \
- System.Drawing.dll \
- System.Web.dll \
- System.Web.Services.dll \
- $(srcdir)/../core/SimiasLib.dll/SimiasLib.dll
-
-#if !LINUX
-# iFolderAdmin_LIBS := $(iFolderAdmin_LIBS) log4net.dll
-#endif
-
-#iFolderAdmin_LIBPATH = $(LOG4NET_DIR)
-
-
-iFolderAdmin_FORMS = \
- AccountEnabled.ascx \
- CreateiFolder.aspx \
- CreateUser.aspx \
- Default.aspx \
- DiskSpaceQuota.ascx \
- SecurityState.ascx \
- Error.aspx \
- FileSizeFilter.ascx \
- FileTypeFilter.ascx \
- Footer.ascx \
- Global.asax \
- Header.ascx \
- iFolderAdminPage.aspx \
- iFolderDetailsPage.aspx \
- iFolderEnabled.ascx \
- iFolders.aspx \
- iFolderSearch.ascx \
- ListFooter.ascx \
- Log4Net.config \
- Login.aspx \
- LogTailHandler.ashx \
- MemberSearch.ascx \
- MemberSelect.aspx \
- OwnerSelect.aspx \
- Policy.ascx \
- ReportLogHandler.ashx \
- Reports.aspx \
- ServerDetails.aspx \
- Servers.aspx \
- SyncInterval.ascx \
- SystemInfo.aspx \
- TopNavigation.ascx \
- UserDetails.aspx \
- Users.aspx \
- Web.config
-
-EXTRA_DIST = AssemblyInfo.cs.in Log4Net.config.in $(iFolderAdmin_CSFILES) $(iFolderAdmin_FORMS) css images help $(iFolderAdmin_RESX) tail.txt
-
-dist-hook:
- rm -rf `find $(distdir)/help -name .svn`
- rm -rf `find $(distdir)/images -name .svn`
- rm -rf `find $(distdir)/css -name .svn`
-
-if DEBUG
-if WINDOWS
-DEBUG_FILES = Novell.iFolderAdmin.pdb
-endif
-endif
-
-CLEAN_FILES = Novell.iFolderAdmin.dll \
- $(iFolderAdmin_RESOURCES) \
- $(DEBUG_FILES)
-
-all: Novell.iFolderAdmin.dll
-
-iFolderAdminWebProxy.cs: ../webservices/iFolderAdmin.wsdl
- wsdl /nologo /out:$@ $<
-
-Novell.iFolderAdmin.dll: iFolderAdminWebProxy.cs $(iFolderAdmin_CSFILES) $(iFolderAdmin_RESOURCES)
- $(CSC) /out:$@ $(CSCFLAGS) $(iFolderAdmin_FLAGS) $(iFolderAdmin_LIBS:%=/r:%) $(iFolderAdmin_RESOURCES:%=/res:%) $(iFolderAdmin_LIBPATH:%=/lib:%) $(iFolderAdmin_CSFILES_CSC)
-
-Novell.iFolderWeb.Admin.%.resources : %.resx
- $(RESGEN) $< $@
-
-install-exec-local: all
- rm -rf $(DESTDIR)$(admindir)
- $(mkinstalldirs) $(DESTDIR)$(admindir)
- $(mkinstalldirs) $(DESTDIR)$(admindir)/bin
- $(mkinstalldirs) $(DESTDIR)$(admindir)/images
- $(mkinstalldirs) $(DESTDIR)$(admindir)/css
- $(mkinstalldirs) $(DESTDIR)$(admindir)/help
- $(mkinstalldirs) $(DESTDIR)$(admindir)/tail
- $(INSTALL_PROGRAM) $(iFolderAdmin_FORMS) $(DESTDIR)$(admindir)
- $(INSTALL_PROGRAM) Novell.iFolderAdmin.dll $(DEBUG_FILES) $(DESTDIR)$(admindir)/bin
- $(INSTALL_PROGRAM) tail.txt $(DESTDIR)$(admindir)/tail
- cd $(srcdir)/help; cp -r * $(DESTDIR)$(admindir)/help
- rm -rf `find $(DESTDIR)$(admindir)/help -name .svn`
- cd $(srcdir)/images; cp -r * $(DESTDIR)$(admindir)/images
- rm -rf `find $(DESTDIR)$(admindir)/images -name .svn`
- cd $(srcdir)/css; cp -r * $(DESTDIR)$(admindir)/css
- rm -rf `find $(DESTDIR)$(admindir)/css -name .svn`
- ln -sf $(DESTDIR)$(admindir)/../web/bin/SimiasLib.dll $(DESTDIR)$(admindir)/bin/
-#if !LINUX
-# $(INSTALL_PROGRAM) $(LOG4NET_DIR)/log4net.dll $(DESTDIR)$(admindir)/bin
-#endif
-
-uninstall-local:
- rm -rf $(DESTDIR)$(admindir)
-
-installcheck-local: install
-
-clean-local:
- rm -rf $(CLEAN_FILES) $(COMMON_CLEAN_FILES)
-
-distclean-local:
- rm -rf $(COMMON_DISTCLEAN_FILES)
-
-maintainer-clean-local:
- rm -rf $(COMMON_MAINTAINER_CLEAN_FILES)
- rm -rf AssemblyInfo.cs
- rm -rf Log4Net.config
-
+# handle Mono secondary dependencies
+export MONO_PATH := $(MONO_PATH)
+iFolderAdmin_CSFILES = \
+ $(srcdir)/AccountEnabled.ascx.cs \
+ $(srcdir)/AssemblyInfo.cs \
+ $(srcdir)/CreateiFolder.aspx.cs \
+ $(srcdir)/CreateUser.aspx.cs \
+ $(srcdir)/Default.aspx.cs \
+ $(srcdir)/DiskSpaceQuota.ascx.cs \
+ $(srcdir)/SecurityState.ascx.cs \
+ $(srcdir)/Error.aspx.cs \
+ $(srcdir)/FileSizeFilter.ascx.cs \
+ $(srcdir)/FileTypeFilter.ascx.cs \
+ $(srcdir)/Footer.ascx.cs \
+ $(srcdir)/Global.asax.cs \
+ $(srcdir)/Header.ascx.cs \
+ $(srcdir)/iFolderAdminPage.aspx.cs \
+ $(srcdir)/iFolderDetailsPage.aspx.cs \
+ $(srcdir)/iFolderEnabled.ascx.cs \
+ $(srcdir)/iFolders.aspx.cs \
+ $(srcdir)/iFolderSearch.ascx.cs \
+ $(srcdir)/iFolderWebLogger.cs \
+ $(srcdir)/ListFooter.ascx.cs \
+ $(srcdir)/Login.aspx.cs \
+ $(srcdir)/LogTailHandler.ashx.cs \
+ $(srcdir)/MemberSearch.ascx.cs \
+ $(srcdir)/MemberSelect.aspx.cs \
+ $(srcdir)/OwnerSelect.aspx.cs \
+ $(srcdir)/Policy.ascx.cs \
+ $(srcdir)/ReportLogHandler.ashx.cs \
+ $(srcdir)/Reports.aspx.cs \
+ $(srcdir)/ServerDetails.aspx.cs \
+ $(srcdir)/Servers.aspx.cs \
+ $(srcdir)/SyncInterval.ascx.cs \
+ $(srcdir)/SystemInfo.aspx.cs \
+ $(srcdir)/TopNavigation.ascx.cs \
+ $(srcdir)/UserDetails.aspx.cs \
+ $(srcdir)/Users.aspx.cs \
+ $(srcdir)/Utils.cs
+
+if !SIMIAS_AS_CLIENT
+iFolderAdmin_CSFILES += $(srcdir)/iFolderAdminWebProxy.cs
+endif
+
+iFolderAdmin_CSFILES_CSC := $(subst /,$(SEP),$(iFolderAdmin_CSFILES))
+
+iFolderAdmin_INCLUDES =
+
+iFolderAdmin_RESX = \
+ $(srcdir)/iFolderAdmin.resx
+# $(shell ls $(srcdir)/iFolderAdmin.*.resx)
+
+iFolderAdmin_RESOURCES := $(iFolderAdmin_RESX:$(srcdir)/%.resx=$(srcdir)/Novell.iFolderWeb.Admin.%.resources)
+
+iFolderAdmin_FLAGS = $(CSC_LIBFLAG)
+
+iFolderAdmin_LIBS = \
+ System.dll \
+ System.Data.dll \
+ $(SYSTEM_XML) \
+ System.Drawing.dll \
+ System.Web.dll \
+ System.Web.Services.dll \
+ $(srcdir)/../core/SimiasLib.dll/SimiasLib.dll
+
+#if !LINUX
+# iFolderAdmin_LIBS := $(iFolderAdmin_LIBS) log4net.dll
+#endif
+
+#iFolderAdmin_LIBPATH = $(LOG4NET_DIR)
+
+
+iFolderAdmin_FORMS = \
+ AccountEnabled.ascx \
+ CreateiFolder.aspx \
+ CreateUser.aspx \
+ Default.aspx \
+ DiskSpaceQuota.ascx \
+ SecurityState.ascx \
+ Error.aspx \
+ FileSizeFilter.ascx \
+ FileTypeFilter.ascx \
+ Footer.ascx \
+ Global.asax \
+ Header.ascx \
+ iFolderAdminPage.aspx \
+ iFolderDetailsPage.aspx \
+ iFolderEnabled.ascx \
+ iFolders.aspx \
+ iFolderSearch.ascx \
+ ListFooter.ascx \
+ Log4Net.config \
+ Login.aspx \
+ LogTailHandler.ashx \
+ MemberSearch.ascx \
+ MemberSelect.aspx \
+ OwnerSelect.aspx \
+ Policy.ascx \
+ ReportLogHandler.ashx \
+ Reports.aspx \
+ ServerDetails.aspx \
+ Servers.aspx \
+ SyncInterval.ascx \
+ SystemInfo.aspx \
+ TopNavigation.ascx \
+ UserDetails.aspx \
+ Users.aspx \
+ Web.config
+
+EXTRA_DIST = AssemblyInfo.cs.in Log4Net.config.in $(iFolderAdmin_CSFILES) $(iFolderAdmin_FORMS) css images help $(iFolderAdmin_RESX) tail.txt
+
+dist-hook:
+ rm -rf `find $(distdir)/help -name .svn`
+ rm -rf `find $(distdir)/images -name .svn`
+ rm -rf `find $(distdir)/css -name .svn`
+
+if DEBUG
+if WINDOWS
+DEBUG_FILES = Novell.iFolderAdmin.pdb
+endif
+endif
+
+CLEAN_FILES = Novell.iFolderAdmin.dll \
+ $(iFolderAdmin_RESOURCES) \
+ $(DEBUG_FILES)
+
+all: Novell.iFolderAdmin.dll
+
+iFolderAdminWebProxy.cs: ../webservices/iFolderAdmin.wsdl
+ wsdl /nologo /out:$@ $<
+
+Novell.iFolderAdmin.dll: iFolderAdminWebProxy.cs $(iFolderAdmin_CSFILES) $(iFolderAdmin_RESOURCES)
+ $(CSC) /out:$@ $(CSCFLAGS) $(iFolderAdmin_FLAGS) $(iFolderAdmin_LIBS:%=/r:%) $(iFolderAdmin_RESOURCES:%=/res:%) $(iFolderAdmin_LIBPATH:%=/lib:%) $(iFolderAdmin_CSFILES_CSC)
+
+Novell.iFolderWeb.Admin.%.resources : %.resx
+ $(RESGEN) $< $@
+
+install-exec-local: all
+ rm -rf $(DESTDIR)$(admindir)
+ $(mkinstalldirs) $(DESTDIR)$(admindir)
+ $(mkinstalldirs) $(DESTDIR)$(admindir)/bin
+ $(mkinstalldirs) $(DESTDIR)$(admindir)/images
+ $(mkinstalldirs) $(DESTDIR)$(admindir)/css
+ $(mkinstalldirs) $(DESTDIR)$(admindir)/help
+ $(mkinstalldirs) $(DESTDIR)$(admindir)/tail
+ $(INSTALL_PROGRAM) $(iFolderAdmin_FORMS) $(DESTDIR)$(admindir)
+ $(INSTALL_PROGRAM) Novell.iFolderAdmin.dll $(DEBUG_FILES) $(DESTDIR)$(admindir)/bin
+ $(INSTALL_PROGRAM) tail.txt $(DESTDIR)$(admindir)/tail
+ cd $(srcdir)/help; cp -r * $(DESTDIR)$(admindir)/help
+ rm -rf `find $(DESTDIR)$(admindir)/help -name .svn`
+ cd $(srcdir)/images; cp -r * $(DESTDIR)$(admindir)/images
+ rm -rf `find $(DESTDIR)$(admindir)/images -name .svn`
+ cd $(srcdir)/css; cp -r * $(DESTDIR)$(admindir)/css
+ rm -rf `find $(DESTDIR)$(admindir)/css -name .svn`
+ ln -sf $(DESTDIR)$(admindir)/../web/bin/SimiasLib.dll $(DESTDIR)$(admindir)/bin/
+#if !LINUX
+# $(INSTALL_PROGRAM) $(LOG4NET_DIR)/log4net.dll $(DESTDIR)$(admindir)/bin
+#endif
+
+uninstall-local:
+ rm -rf $(DESTDIR)$(admindir)
+
+installcheck-local: install
+
+clean-local:
+ rm -rf $(CLEAN_FILES) $(COMMON_CLEAN_FILES)
+
+distclean-local:
+ rm -rf $(COMMON_DISTCLEAN_FILES)
+
+maintainer-clean-local:
+ rm -rf $(COMMON_MAINTAINER_CLEAN_FILES)
+ rm -rf AssemblyInfo.cs
+ rm -rf Log4Net.config
+
Index: src/Makefile.am
===================================================================
--- src/Makefile.am (revision 6753)
+++ src/Makefile.am (working copy)
@@ -5,7 +5,7 @@
SUBDIRS = core server webservices webaccess admin setup utils
endif
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = core client server webservices webaccess admin setup utils
EXTRA_DIST =
Index: help-linux/Makefile.am
===================================================================
--- help-linux/Makefile.am (revision 6510)
+++ help-linux/Makefile.am (working copy)
@@ -1,5 +1,8 @@
EXTRA_DIST = en cs de es fr hu it ja pl pt ru sk zh-CN zh-TW
+dist-hook:
+ rm -rf `find $(distdir) -name ".svn"`
+
install-exec-local:
$(mkinstalldirs) $(DESTDIR)$(datadir)/ifolder3/help
cp -r $(EXTRA_DIST) $(DESTDIR)$(datadir)/ifolder3/help
Index: configure.in
===================================================================
--- configure.in (revision 6510)
+++ configure.in (working copy)
@@ -1,9 +1,10 @@
-AC_INIT(src/WebService/iFolder.cs)
+AC_INIT(ifolder3, 3.5)
+AC_CONFIG_SRCDIR(src/WebService/iFolder.cs)
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
m4_pattern_allow(PKG_CONFIG)
-AM_INIT_AUTOMAKE(ifolder3, 3.5)
+AM_INIT_AUTOMAKE([tar-ustar])
# Check to see if the BUILDNUM is set by global build
if test "$BUILDNUM" = ""; then
let "BUILDNUM=`date +%G%j`-2000000"
Index: src/WebService/Makefile.am
===================================================================
--- src/WebService/Makefile.am (revision 6510)
+++ src/WebService/Makefile.am (working copy)
@@ -10,7 +10,7 @@
iFolderWebService_LIBPATH = $(LOG4NET_DIR) $(webbindir)
GenerateWsdl_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll System.Web.Services.dll
-EXTRA_DIST = iFolder.asmx $(iFolderWebService_CSFILES) AssemblyInfo.cs.in
+EXTRA_DIST = iFolder.asmx $(iFolderWebService_CSFILES) AssemblyInfo.cs.in GenerateWsdl.cs
AssemblyInfo.cs: $(srcdir)/AssemblyInfo.cs.in Makefile
sed -e 's,@_VERSION_@,@VERSION@,g' $< > $@
Index: Makefile.am
===================================================================
--- Makefile.am (revision 6510)
+++ Makefile.am (working copy)
@@ -1,11 +1,10 @@
if LINUX
SUBDIRS = src help-linux po
-DIST_SUBDIRS = $(SUBDIRS) doc package test
else
SUBDIRS = src help po
-DIST_SUBDIRS = $(SUBDIRS) doc package test help-linux
endif
+DIST_SUBDIRS = $(SUBDIRS) doc package test help-linux help po
# remove all of the CVS directories
dist-hook:
@@ -20,10 +19,10 @@
endif
endif
-EXTRA_DIST = \
- tools \
- $(srcdir)/$(PACKAGE)*.pc.in \
- $(ADDITIONAL_LIB_FILES) \
+EXTRA_DIST = \
+ tools \
+ $(srcdir)/$(PACKAGE)*.pc.in \
+ $(ADDITIONAL_LIB_FILES) \
$(srcdir)/intltool-*.in
all: ifolder3.pc ifolder3-c.pc
_______________________________________________
ifolder-dev mailing list
[email protected]
http://forge.novell.com/mailman/listinfo/ifolder-dev
