New file, a script used to build a Win32 zipfile distribution of E-D-S.

2005-12-02  Tor Lillqvist  <tml@novell.com>

	* evolution-data-server-zip.in: New file, a script used to build a
	Win32 zipfile distribution of E-D-S. (End users will not be
	expected to install from zipfiles, they would be for power users
	and developers only.)

	* Makefile.am
	* configure.in: Distribute and expand it.

diff --git a/ChangeLog b/ChangeLog
index 173b8a3..4107421 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-12-02  Tor Lillqvist  <tml@novell.com>
+
+       * evolution-data-server-zip.in: New file, a script used to build a
+       Win32 zipfile distribution of E-D-S. (End users will not be
+       expected to install from zipfiles, they would be for power users
+       and developers only.)
+
+       * Makefile.am
+       * configure.in: Distribute and expand it.
+
 2005-12-01  Chenthill Palanisamy  <pchenthill@novell.com>
 
        reviewed by Srinivasa Ragavan  <sragavan@novell.com>

diff --git a/Makefile.am b/Makefile.am
index a6a94cb..ff4e489 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,7 @@ EXTRA_DIST =                                          \
        intltool-merge.in                               \
        intltool-update.in                              \
        intltool-extract.in                             \
+       evolution-data-server-zip.in                    \
        $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)     \
        $(LIBDB_FILES)
 

diff --git a/configure.in b/configure.in
index 2b76399..553cc1e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1039,7 +1039,8 @@ AC_SUBST(LDAP_CFLAGS)
 AC_SUBST(LDAP_LIBS)
 AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support])
 AM_CONDITIONAL(ENABLE_LDAP, true)
-msg_no_ntlm=no
+msg_ldap="yes"
+msg_no_ntlm="no"
 msg_exchange="yes"
 fi # Win32
 
@@ -1269,6 +1270,7 @@ AC_CONFIG_SUBDIRS(libdb/dist)
 
 AC_OUTPUT([
 Makefile
+evolution-data-server-zip
 evolution-data-server.pc
 addressbook/Makefile
 addressbook/idl/Makefile

diff --git a/evolution-data-server-zip.in b/evolution-data-server-zip.in
new file mode 100755 (executable)
index 0000000..c90aac4
--- /dev/null
+++ b/evolution-data-server-zip.in
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+# Build Win32 zipfile distribution of evolution-data-server. Separate
+# runtime and developer zipfiles. End-users will install Evolution
+# using an executable installer combining all necessary pieces, of
+# course, not unzipping each module separately.
+
+ZIP=/tmp/evolution-data-server-@VERSION@.zip
+DEVZIP=/tmp/evolution-data-server-dev-@VERSION@.zip
+
+LIBEDATASERVER_CURRENT_MINUS_AGE=`expr @LIBEDATASERVER_CURRENT@ - @LIBEDATASERVER_AGE@`
+LIBEGROUPWISE_CURRENT_MINUS_AGE=`expr @LIBEGROUPWISE_CURRENT@ - @LIBEGROUPWISE_AGE@`
+LIBEXCHANGE_STORAGE_CURRENT_MINUS_AGE=`expr @LIBEXCHANGE_STORAGE_CURRENT@ - @LIBEXCHANGE_STORAGE_AGE@`
+LIBCAMEL_CURRENT_MINUS_AGE=`expr @LIBCAMEL_CURRENT@ - @LIBCAMEL_AGE@`
+LIBEDATASERVERUI_CURRENT_MINUS_AGE=`expr @LIBEDATASERVERUI_CURRENT@ - @LIBEDATASERVERUI_AGE@`
+LIBEBOOK_CURRENT_MINUS_AGE=`expr @LIBEBOOK_CURRENT@ - @LIBEBOOK_AGE@`
+LIBEDATABOOK_CURRENT_MINUS_AGE=`expr @LIBEDATABOOK_CURRENT@ - @LIBEDATABOOK_AGE@`
+LIBECAL_CURRENT_MINUS_AGE=`expr @LIBECAL_CURRENT@ - @LIBECAL_AGE@`
+LIBEDATACAL_CURRENT_MINUS_AGE=`expr @LIBEDATACAL_CURRENT@ - @LIBEDATACAL_AGE@`
+LIBEDATASERVERUI_CURRENT_MINUS_AGE=`expr @LIBEDATASERVERUI_CURRENT@ - @LIBEDATASERVERUI_AGE@`
+
+cd @prefix@
+rm $ZIP
+zip $ZIP -@ <<EOF
+bin/libedataserver-1.2-$LIBEDATASERVER_CURRENT_MINUS_AGE.dll
+bin/libegroupwise-1.2-$LIBEGROUPWISE_CURRENT_MINUS_AGE.dll
+bin/libexchange-storage-1.2-$LIBEXCHANGE_STORAGE_CURRENT_MINUS_AGE.dll
+bin/libcamel-1.2-0.dll
+bin/libcamel-provider-1.2-$LIBCAMEL_CURRENT_MINUS_AGE.dll
+bin/libebook-1.2-$LIBEBOOK_CURRENT_MINUS_AGE.dll
+bin/libedata-book-1.2-$LIBEDATABOOK_CURRENT_MINUS_AGE.dll
+bin/libecal-1.2-$LIBECAL_CURRENT_MINUS_AGE.dll
+bin/libedata-cal-1.2-$LIBEDATACAL_CURRENT_MINUS_AGE.dll
+bin/libedataserverui-1.2-$LIBEDATASERVERUI_CURRENT_MINUS_AGE.dll
+lib/evolution-data-server-1.2/camel-providers/libcamelpop3.urls
+lib/evolution-data-server-1.2/camel-providers/libcamelpop3.dll
+lib/evolution-data-server-1.2/camel-providers/libcamelsmtp.urls
+lib/evolution-data-server-1.2/camel-providers/libcamelsmtp.dll
+lib/evolution-data-server-1.2/camel-providers/libcamelimap.urls
+lib/evolution-data-server-1.2/camel-providers/libcamelimap.dll
+lib/evolution-data-server-1.2/camel-providers/libcamelnntp.urls
+lib/evolution-data-server-1.2/camel-providers/libcamelnntp.dll
+lib/evolution-data-server-1.2/camel-providers/libcamellocal.urls
+lib/evolution-data-server-1.2/camel-providers/libcamellocal.dll
+lib/evolution-data-server-1.2/camel-providers/libcamelgroupwise.urls
+lib/evolution-data-server-1.2/camel-providers/libcamelgroupwise.dll
+lib/evolution-data-server-1.2/camel-providers/libcamelhula.urls
+lib/evolution-data-server-1.2/camel-providers/libcamelhula.dll
+lib/evolution-data-server-1.2/extensions/libebookbackendfile.dll
+lib/evolution-data-server-1.2/extensions/libebookbackendvcf.dll
+lib/evolution-data-server-1.2/extensions/libebookbackendldap.dll
+lib/evolution-data-server-1.2/extensions/libebookbackendgroupwise.dll
+lib/evolution-data-server-1.2/extensions/libecalbackendfile.dll
+lib/evolution-data-server-1.2/extensions/libecalbackendgroupwise.dll
+lib/evolution-data-server-1.2/extensions/libecalbackendhttp.dll
+lib/evolution-data-server-1.2/extensions/libecalbackendcontacts.dll
+lib/evolution-data-server-1.2/extensions/libecalbackendweather.dll
+lib/bonobo/servers/GNOME_Evolution_DataServer_1.2.server
+libexec/evolution-data-server-@BASE_VERSION@.exe
+share/evolution-data-server-@BASE_VERSION@/weather/Locations.xml
+share/evolution-data-server-@BASE_VERSION@/glade/e-categories-dialog.glade
+share/evolution-data-server-@BASE_VERSION@/glade/e-name-selector-dialog.glade
+EOF
+
+zip -r $ZIP share/evolution-data-server-1.6/zoneinfo
+
+zip -r $ZIP share/pixmaps/evolution-data-server-@BASE_VERSION@
+
+zip $ZIP lib/locale/*/LC_MESSAGES/evolution-data-server-@BASE_VERSION@.mo
+
+rm $DEVZIP
+zip -r $DEVZIP -@ <<EOF
+lib/libedataserver-1.2.dll.a
+lib/libegroupwise-1.2.dll.a
+lib/libexchange-storage-1.2.dll.a
+lib/libcamel-1.2.dll.a
+lib/libcamel-provider-1.2.dll.a
+lib/libebook-1.2.dll.a
+lib/libedata-book-1.2.dll.a
+lib/libecal-1.2.dll.a
+lib/libedata-cal-1.2.dll.a
+lib/libedataserverui-1.2.dll.a
+lib/pkgconfig/libedataserver-1.2.pc
+lib/pkgconfig/libegroupwise-1.2.pc
+lib/pkgconfig/libexchange-storage-1.2.pc
+lib/pkgconfig/camel-1.2.pc
+lib/pkgconfig/camel-provider-1.2.pc
+lib/pkgconfig/libebook-1.2.pc
+lib/pkgconfig/libedata-book-1.2.pc
+lib/pkgconfig/libecal-1.2.pc
+lib/pkgconfig/libedata-cal-1.2.pc
+lib/pkgconfig/libedataserverui-1.2.pc
+lib/pkgconfig/evolution-data-server-1.2.pc
+include/evolution-data-server-@BASE_VERSION@/libedataserver
+include/evolution-data-server-@BASE_VERSION@/groupwise
+include/evolution-data-server-@BASE_VERSION@/exchange
+include/evolution-data-server-@BASE_VERSION@/camel
+include/evolution-data-server-@BASE_VERSION@/libebook
+include/evolution-data-server-@BASE_VERSION@/libedata-book
+include/evolution-data-server-@BASE_VERSION@/libical
+include/evolution-data-server-@BASE_VERSION@/libecal
+include/evolution-data-server-@BASE_VERSION@/libedata-cal
+include/evolution-data-server-@BASE_VERSION@/libedataserverui
+share/idl/evolution-data-server-1.2/Evolution-DataServer-Addressbook.idl
+share/idl/evolution-data-server-1.2/Evolution-DataServer-Calendar.idl
+share/idl/evolution-data-server-1.2/Evolution-DataServer.idl
+share/gtk-doc/html/libebook
+share/gtk-doc/html/libecal
+share/gtk-doc/html/libedata-cal
+share/gtk-doc/html/libedataserver
+EOF