Author: varkoly
Date: Wed May 30 20:07:53 2007
New Revision: 38213
URL: http://svn.opensuse.org/viewcvs/yast?rev=38213&view=rev
Log:
introducing the start wizard to choose the configuration type
Added:
trunk/mail/src/MailServerLDAP.pm
trunk/mail/src/mail-advanced.ycp
trunk/mail/src/mail-server_ldap-setup.ycp
trunk/mail/src/mail-standard.ycp
trunk/mail/src/sysconfig.mail
Modified:
trunk/mail/permissions/Makefile.in
trunk/mail/src/MailServer.ycp
trunk/mail/src/Makefile.am
trunk/mail/src/YaPI/MailServer.pm
trunk/mail/src/mail-server_dialogs.ycp
trunk/mail/src/mail-server_wizards.ycp
trunk/mail/src/mail.ycp
trunk/mail/users-plugin/Makefile.in
Modified: trunk/mail/permissions/Makefile.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/permissions/Makefile.in?rev=38213&r1=38212&r2=38213&view=diff
==============================================================================
--- trunk/mail/permissions/Makefile.in (original)
+++ trunk/mail/permissions/Makefile.in Wed May 30 20:07:53 2007
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -19,15 +19,11 @@
# Makefile.am.common -*- Makefile -*-
# Generated file, do not edit!
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -71,15 +67,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-CREATE_PKGCONFIG_FALSE = @CREATE_PKGCONFIG_FALSE@
-CREATE_PKGCONFIG_NOARCH_FALSE = @CREATE_PKGCONFIG_NOARCH_FALSE@
-CREATE_PKGCONFIG_NOARCH_TRUE = @CREATE_PKGCONFIG_NOARCH_TRUE@
-CREATE_PKGCONFIG_TRUE = @CREATE_PKGCONFIG_TRUE@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -90,6 +83,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINTAINER = @MAINTAINER@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MYEXPECT = @MYEXPECT@
MYRUNTEST = @MYRUNTEST@
PACKAGE = @PACKAGE@
@@ -111,10 +105,14 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
-ac_ct_STRIP = @ac_ct_STRIP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
agentdir = @agentdir@
am__leading_dot = @am__leading_dot@
am__tar = @am__tar@
@@ -125,10 +123,13 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
clientdir = @clientdir@
datadir = @datadir@
+datarootdir = @datarootdir@
desktopdir = @desktopdir@
docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
execcompdir = @execcompdir@
fillupdir = @fillupdir@
@@ -137,6 +138,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
imagedir = @imagedir@
includedir = @includedir@
infodir = @infodir@
@@ -149,16 +151,19 @@
mkdir_p = @mkdir_p@
moduledir = @moduledir@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
pkgconfigdatadir = @pkgconfigdatadir@
pkgconfigdir = @pkgconfigdir@
plugindir = @plugindir@
potdir = @potdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
schemadir = @schemadir@
scrconfdir = @scrconfdir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
@@ -166,6 +171,8 @@
target_os = @target_os@
target_vendor = @target_vendor@
themedir = @themedir@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
yast2dir = @yast2dir@
ybindir = @ybindir@
ydatadir = @ydatadir@
@@ -186,6 +193,7 @@
# where ycpchook contains a symlink to "."
# Otherwise "." keeps being newer than .dep and we loop.
NEWDEP = ${top_builddir}/.dep.new
+CHECK_SYNTAX = true
all: all-am
.SUFFIXES:
@@ -218,10 +226,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-modulebinDATA: $(modulebin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(modulebindir)" || $(mkdir_p) "$(DESTDIR)$(modulebindir)"
+ test -z "$(modulebindir)" || $(MKDIR_P) "$(DESTDIR)$(modulebindir)"
@list='$(modulebin_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -238,7 +245,7 @@
done
install-permissionsDATA: $(permissions_DATA)
@$(NORMAL_INSTALL)
- test -z "$(permissionsdir)" || $(mkdir_p) "$(DESTDIR)$(permissionsdir)"
+ test -z "$(permissionsdir)" || $(MKDIR_P) "$(DESTDIR)$(permissionsdir)"
@list='$(permissions_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -261,23 +268,21 @@
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/..
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -296,7 +301,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(permissionsdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -344,12 +349,20 @@
install-data-am: install-modulebinDATA install-permissionsDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -368,18 +381,20 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-modulebinDATA \
- uninstall-permissionsDATA
+uninstall-am: uninstall-modulebinDATA uninstall-permissionsDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic dist-hook \
distclean distclean-generic distdir dvi dvi-am html html-am \
info info-am install install-am install-data install-data-am \
- install-exec install-exec-am install-info install-info-am \
- install-man install-modulebinDATA install-permissionsDATA \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am uninstall-modulebinDATA \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-modulebinDATA install-pdf install-pdf-am \
+ install-permissionsDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am uninstall-modulebinDATA \
uninstall-permissionsDATA
@@ -396,9 +411,19 @@
rm ${NEWDEP}
dist-hook: check-syntax
-
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
-include .dep
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Modified: trunk/mail/src/MailServer.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServer.ycp?rev=38213&r1=38212&r2=38213&view=diff
==============================================================================
--- trunk/mail/src/MailServer.ycp (original)
+++ trunk/mail/src/MailServer.ycp Wed May 30 20:07:53 2007
@@ -366,9 +366,6 @@
return false;
}
}
- if( SCR::Read(.target.size, "/var/adm/yast2-mail-server-used") < 0) {
- YaPI::MailServer::ResetMailServer(MailServer::AdminPassword,MailServer::LDAPDefaults);
- }
NetworkDevices::Read();
map TMP = NetworkDevices::Export("modem");
Added: trunk/mail/src/MailServerLDAP.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServerLDAP.pm?rev=38213&view=auto
==============================================================================
--- trunk/mail/src/MailServerLDAP.pm (added)
+++ trunk/mail/src/MailServerLDAP.pm Wed May 30 20:07:53 2007
@@ -0,0 +1,97 @@
+=head1 NAME
+
+MailServerLDAP
+
+=head1 PREFACE
+
+This package is a part of the YaST2 mail modul.
+
+=head1 SYNOPSIS
+
+use MailServerLDAP
+
+
+=head1 DESCRIPTION
+
+B<MailServerLDAP> provides a function ConfigureLDAPServer that makes the local
+LDAP server able to store the tables of the mail server.
+
+=over 2
+
+=cut
+
+package MailServerLDAP;
+
+use strict;
+
+use YaST::YCP;
+
+textdomain("MailServer");
+
+our %TYPEINFO;
+
+YaST::YCP::Import ("Ldap");
+YaST::YCP::Import ("YaPI::LdapServer");
+
+
+sub ConfigureLDAPServer()
+{
+ # don't configure if using eDirectory server
+ Ldap->CheckNDS ();
+ if (! Ldap->nds())
+ {
+ # Now we configure the LDAP-Server to be able store the mail server configuration
+ my $schemas = YaPI::LdapServer->ReadSchemaIncludeList();
+ my $SCHEMA = join "",@{$schemas};
+ if( $SCHEMA !~ /dnszone.schema/ )
+ {
+ push @{$schemas},'/etc/openldap/schema/dnszone.schema';
+ }
+ if( $SCHEMA !~ /suse-mailserver.schema/ )
+ {
+ push @{$schemas},'/etc/openldap/schema/suse-mailserver.schema';
+ YaPI::LdapServer->WriteSchemaIncludeList($schemas);
+ my $indices = YaPI::LdapServer->ReadIndex($ldapMap->{ldap_domain});
+ my $SuSEMailClient = 0;
+ my $SuSEMailDomainMasquerading = 0;
+ my $suseTLSPerSitePeer= 0;
+ foreach my $index (@{$indices})
+ {
+ if( $index->{attr} eq "SuSEMailClient,SUSEMailAcceptAddress,zoneName")
+ {
+ $SuSEMailClient = 1;
+ }
+ if( $index->{attr} eq "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType")
+ {
+ $SuSEMailDomainMasquerading = 1;
+ }
+ if( $index->{attr} eq "suseTLSPerSitePeer,SuSEMailTransportDestination")
+ {
+ $suseTLSPerSitePeer = 1;
+ }
+ }
+ if(!$SuSEMailClient)
+ {
+ YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain},
+ { "attr" => "SuSEMailClient,SUSEMailAcceptAddress,zoneName",
+ "param" => "eq" }
+ );
+ }
+ if(!$SuSEMailDomainMasquerading)
+ {
+ YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain},
+ { "attr" => "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType",
+ "param" => "eq" }
+ );
+ }
+ if(!$SuSEMailClient)
+ {
+ YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain},
+ { "attr" => "suseTLSPerSitePeer,SuSEMailTransportDestination",
+ "param" => "eq" }
+ );
+ }
+ YaPI::LdapServer->RecreateIndex($ldapMap->{ldap_domain});
+ }
+ }
+}
Modified: trunk/mail/src/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/Makefile.am?rev=38213&r1=38212&r2=38213&view=diff
==============================================================================
--- trunk/mail/src/Makefile.am (original)
+++ trunk/mail/src/Makefile.am Wed May 30 20:07:53 2007
@@ -12,8 +12,8 @@
client_DATA = \
mail.ycp \
mail_auto.ycp \
- \
- mail-server.ycp \
+ mail-standard.ycp \
+ mail-advanced.ycp \
mail-server_auto.ycp \
mail-server_proposal.ycp
@@ -34,7 +34,8 @@
module_DATA = \
Mail.ycp \
- MailServer.ycp
+ MailServer.ycp \
+ MailServerLDAP.pm
ldapschema_DATA = suse-mailserver.schema
Modified: trunk/mail/src/YaPI/MailServer.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/YaPI/MailServer.pm?rev=38213&r1=38212&r2=38213&view=diff
==============================================================================
--- trunk/mail/src/YaPI/MailServer.pm (original)
+++ trunk/mail/src/YaPI/MailServer.pm Wed May 30 20:07:53 2007
@@ -43,13 +43,12 @@
our @CAPABILITIES = (
'SLES10'
);
-our $VERSION="1.1.0";
+our $VERSION="2.2.0";
YaST::YCP::Import ("SCR");
YaST::YCP::Import ("Service");
YaST::YCP::Import ("Ldap");
YaST::YCP::Import ("NetworkDevices");
-YaST::YCP::Import ("YaPI::LdapServer");
##
#
@@ -2184,7 +2183,7 @@
The LDAP Base for the DNS Configuration
The LDAP Base for the MAIL Configuration
The LDAP Template for the MAIL Configuration
-If the last two does not exist this will be created.
+If the last there does not exist this will be created.
The result is an hash of following structur:
@@ -2575,65 +2574,6 @@
SCR->Write(".sysconfig.mail.MAIL_CREATE_CONFIG","no");
SCR->Write(".sysconfig.mail",undef);
- # don't configure if using eDirectory server
- Ldap->CheckNDS ();
- if (! Ldap->nds())
- {
- # Now we configure the LDAP-Server to be able store the mail server configuration
- my $schemas = YaPI::LdapServer->ReadSchemaIncludeList();
- my $SCHEMA = join "",@{$schemas};
- if( $SCHEMA !~ /dnszone.schema/ )
- {
- push @{$schemas},'/etc/openldap/schema/dnszone.schema';
- }
- if( $SCHEMA !~ /suse-mailserver.schema/ )
- {
- push @{$schemas},'/etc/openldap/schema/suse-mailserver.schema';
- YaPI::LdapServer->WriteSchemaIncludeList($schemas);
- my $indices = YaPI::LdapServer->ReadIndex($ldapMap->{ldap_domain});
- my $SuSEMailClient = 0;
- my $SuSEMailDomainMasquerading = 0;
- my $suseTLSPerSitePeer= 0;
- foreach my $index (@{$indices})
- {
- if( $index->{attr} eq "SuSEMailClient,SUSEMailAcceptAddress,zoneName")
- {
- $SuSEMailClient = 1;
- }
- if( $index->{attr} eq "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType")
- {
- $SuSEMailDomainMasquerading = 1;
- }
- if( $index->{attr} eq "suseTLSPerSitePeer,SuSEMailTransportDestination")
- {
- $suseTLSPerSitePeer = 1;
- }
- }
- if(!$SuSEMailClient)
- {
- YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain},
- { "attr" => "SuSEMailClient,SUSEMailAcceptAddress,zoneName",
- "param" => "eq" }
- );
- }
- if(!$SuSEMailDomainMasquerading)
- {
- YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain},
- { "attr" => "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType",
- "param" => "eq" }
- );
- }
- if(!$SuSEMailClient)
- {
- YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain},
- { "attr" => "suseTLSPerSitePeer,SuSEMailTransportDestination",
- "param" => "eq" }
- );
- }
- YaPI::LdapServer->RecreateIndex($ldapMap->{ldap_domain});
- }
- }
-
#Put user postfix into the group mail
system($check_postfix);
Added: trunk/mail/src/mail-advanced.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-advanced.ycp?rev=38213&view=auto
==============================================================================
--- trunk/mail/src/mail-advanced.ycp (added)
+++ trunk/mail/src/mail-advanced.ycp Wed May 30 20:07:53 2007
@@ -0,0 +1,106 @@
+/**
+ * File: clients/mail-server.ycp
+ * Package: Configuration of mail-server
+ * Summary: Main file
+ * Authors: Peter Varkoly
+ *
+ * $Id: mail-server.ycp 19955 2004-10-26 12:28:16Z varkoly $
+ *
+ * Main file for mail-server configuration. Uses all other files.
+ */
+
+{
+
+/***
+ * <h3>Configuration of mail-server</h3>
+ */
+
+textdomain "MailServer";
+
+/* The main () */
+y2milestone ("----------------------------------------");
+y2milestone ("MailServer module started");
+
+import "Progress";
+import "Report";
+import "Summary";
+import "Popup";
+import "Label";
+
+import "CommandLine";
+include "mail/mail-server_wizards.ycp";
+
+map cmdline_description = $[
+ "id" : "mail-server",
+ /* Command line help text for the mail-server module */
+ "help" : _("Configuration of mail server"),
+ "guihandler" : MailServerSequence,
+ "initialize" : MailServer::Read,
+ "finish" : MailServer::Write,
+ "actions" : $[
+ "setup" : $[
+ "handler" : MailServerSequence,
+ "help" : _("Advanced Mail Server setup with LDAP backend"),
+ ],
+ ],
+ "options" : $[
+ // FIXME TODO: fill the option descriptions here
+ ],
+ "mapping" : $[
+ // FIXME TODO: fill the mappings of actions and options here
+ ]
+];
+
+/* analyze command line */
+boolean propose = false;
+boolean setup = false;
+list args = WFM::Args();
+if(size(args) > 0) {
+ if(is(WFM::Args(0), path) && WFM::Args(0) == .propose) {
+ y2milestone("Using PROPOSE mode");
+ propose = true;
+ }
+ if(contains(args,"setup")) {
+ y2milestone("Using setup mode");
+ setup = true;
+ }
+}
+
+/*
+ after merging yast2-mail and yast2-mail-server we have to be
+ carefull not to corrupt the configuration of the other modul
+*/
+if( !setup && SCR::Read (.sysconfig.mail.MAIL_CREATE_CONFIG)== "yes" )
+{
+ if(
+ ! Popup::AnyQuestionRichText(
+ Label::WarningMsg(),
+ _("You have configured your MTA without LDAP support.<br>") +
+ _("This modul will configure your MTA with LDAP support.<br>") +
+ _("This will corrupt your actuall configuration."),
+ 80, 10,
+ Label::ContinueButton(),
+ Label::CancelButton(),
+ `focus_no
+ )
+ )
+ {
+ return nil;
+ }
+}
+
+/* main ui function */
+any ret = nil;
+
+if(propose) ret = MailServerAutoSequence();
+else ret = CommandLine::Run(cmdline_description);
+y2debug("ret=%1", ret);
+
+/* Finish */
+y2milestone("MailServer module finished");
+y2milestone("----------------------------------------");
+
+return ret;
+
+/* EOF */
+}
Modified: trunk/mail/src/mail-server_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_dialogs.ycp?rev=38213&r1=38212&r2=38213&view=diff
==============================================================================
--- trunk/mail/src/mail-server_dialogs.ycp (original)
+++ trunk/mail/src/mail-server_dialogs.ycp Wed May 30 20:07:53 2007
@@ -18,7 +18,6 @@
import "Service";
import "Users";
import "YaPI::MailServer";
-import "YaPI::LdapServer";
include "mail/helps.ycp";
@@ -29,11 +28,24 @@
*/
define any AuthorizingDialog () {
- string ERROR = "";
+ string ERROR = _("You must configure LDAP to use the mail server.");
Ldap::Read();
map LDAPSettings = Ldap::Export();
- if(LDAPSettings["base_config_dn"]:"" == "" ) {
- ERROR = _("You must configure LDAP to use the mail server.");
+ if(LDAPSettings["ldap_server"]:"" == "" )
+ {
+ ERROR = ERROR + "\n" + _("Now we will start the LDAP-Server setup vizard.");
+ if(Popup::YesNo(ERROR))
+ {
+ return `ldapsetup;
+ }
+ else
+ {
+ return `abort;
+ }
+ Ldap::Read();
+ }
+ if(LDAPSettings["base_config_dn"]:"" == "" )
+ {
ERROR = ERROR + "\n";
}
Ldap::LDAPInit();
@@ -70,46 +82,7 @@
MailServer::CertExist = true;
}
-
- string caption = _("Mail Server Administrator Authorization");
- term contents = `HBox(
- `HStretch(),
- `Password(`id(`password), _("&Enter the Password for LDAP Server:"), ""),
- `HStretch()
- );
-
- Wizard::SetContentsButtons(caption, contents, HELPS["AuthorizingDialog"]:"",
- Label::BackButton(), Label::NextButton());
- Wizard::SetDesktopIcon("mailserver");
- UI::WizardCommand(`SetBackButtonLabel( "" ) );
- UI::SetFocus (`id (`password));
-
- any ret = nil;
- while(true) {
-
- ret = UI::UserInput();
-
- MailServer::AdminPassword = (string) UI::QueryWidget(`id(`password), `Value);
-
- /* abort? */
- if(ret == `abort || ret == `cancel) {
- if(ReallyAbort()) break;
- else continue;
- } else if(ret == `next) {
- MailServer::LDAPDefaults = (map) YaPI::MailServer::ReadLDAPDefaults(
- MailServer::AdminPassword);
- if (MailServer::LDAPDefaults == nil) {
- Popup::Error(_("Unable to Authorize the Administrator User"));
- continue;
- }
- return ret;
- } else {
- y2error("unexpected retcode: %1", ret);
- continue;
- }
- }
-
- return ret;
+ return Ldap::LDAPAskAndBind(false);
}
Added: trunk/mail/src/mail-server_ldap-setup.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_ldap-setup.ycp?rev=38213&view=auto
==============================================================================
--- trunk/mail/src/mail-server_ldap-setup.ycp (added)
+++ trunk/mail/src/mail-server_ldap-setup.ycp Wed May 30 20:07:53 2007
@@ -0,0 +1,38 @@
+/**
+ * File:
+ * clients/mail-server-ldap-setup.ycp
+ *
+ * Package:
+ * Configuration of mail
+ *
+ * Summary:
+ * Setup of a LDAP server to be able store the mail server datas
+ *
+ * Authors:
+ * Peter Varkoly
+ *
+ * $Id: mail.ycp 37642 2007-04-20 19:06:52Z varkoly $
+ *
+ *
+ */
+
+{
+textdomain "mail";
+import "Ldap";
+import "MailServerLDAP";
+import "YaPI::MailServer";
+
+ string ERROR = "";
+
+ y2milestone("--- mail-server-ldap-setup: Detgecting if we are LDAP-Client ---");
+ Ldap::Read();
+ map LDAPSettings = Ldap::Export();
+ if(LDAPSettings["base_config_dn"]:"" == "" )
+ {
+ y2milestone("--- mail-server-ldap-setup: We are not LDAP Client ---");
+ }
+ y2milestone("--- mail-server-ldap-setup: We are LDAP Client ---");
+ Ldap::LDAPInit();
+ Ldap::LDAPAskAndBind(false);
+ YaPI::MailServer::ResetMailServer();
+}
Modified: trunk/mail/src/mail-server_wizards.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_wizards.ycp?rev=38213&r1=38212&r2=38213&view=diff
==============================================================================
--- trunk/mail/src/mail-server_wizards.ycp (original)
+++ trunk/mail/src/mail-server_wizards.ycp Wed May 30 20:07:53 2007
@@ -19,6 +19,31 @@
/**
+ * Workflow of the LDAP Server/Client setup
+ * @return sequence result
+ */
+any LdapSetupSequence() {
+
+ /* FIXME: adapt to your needs */
+ map aliases = $[
+ "complex" : ``( ComplexDialog() )
+ ];
+
+ /* FIXME: adapt to your needs */
+ map sequence = $[
+ "ws_start" : "complex",
+ "complex" : $[
+ `abort : `abort,
+ `next : `next
+ ]
+ ];
+
+ any ret = Sequencer::Run(aliases, sequence);
+
+ return ret;
+}
+
+/**
* Main workflow of the mail-server configuration
* @return sequence result
*/
@@ -50,10 +75,11 @@
any MailServerSequence() {
map aliases = $[
- "read" : [ ``( ReadDialog() ), true ],
- "auth" : [ ``( AuthorizingDialog() ), true ],
- "main" : ``( MainSequence() ),
- "write" : [ ``( WriteDialog() ), true ]
+ "read" : [ ``( ReadDialog() ), true ],
+ "auth" : [ ``( AuthorizingDialog() ), true ],
+ "main" : ``( MainSequence() ),
+ "ldapsetup" : ``( LdapSetupSequence() ),
+ "write" : [ ``( WriteDialog() ), true ]
];
map sequence = $[
Added: trunk/mail/src/mail-standard.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-standard.ycp?rev=38213&view=auto
==============================================================================
--- trunk/mail/src/mail-standard.ycp (added)
+++ trunk/mail/src/mail-standard.ycp Wed May 30 20:07:53 2007
@@ -0,0 +1,110 @@
+/**
+ * File:
+ * clients/mail.ycp
+ *
+ * Package:
+ * Configuration of mail
+ *
+ * Summary:
+ * Main file
+ *
+ * Authors:
+ * Martin Vidner
+ * Peter Varkoly
+ *
+ * $Id: mail.ycp 37642 2007-04-20 19:06:52Z varkoly $
+ *
+ * Main file for mail configuration. Uses all other files.
+ *
+ */
+
+/**
+ * @param flag "<b>permanent</b>", "<b>dialup</b>", or "<b>screenshots</b>"<br>
+ * <dl>
+ * <dt>permanent<dd>preselects permanent connnection
+ * <dt>dialup<dd>preselects dial-up connnection
+ * <dt>screenshots
+ * <dd>uses faked data (see Mail::Fake), enables running the module
+ * as non-root. (Uses Mode::screen_shot().)
+ * </dl>
+ */
+{
+ /***
+ * <h3>Configuration of the mail</h3>
+ */
+
+ textdomain "mail";
+
+ import "CommandLine";
+ import "Mail";
+ import "RichText";
+ include "mail/ui.ycp";
+
+ /* The main () */
+ y2milestone ("Mail standard module started");
+ y2milestone ("----------------------------------------");
+
+ /* parse arguments */
+ list args = WFM::Args ();
+ string first_arg = args[0]:"";
+ if (first_arg == "permanent")
+ {
+ preselect_connection_type = `permanent;
+ }
+ else if (first_arg == "dialup")
+ {
+ preselect_connection_type = `dialup;
+ }
+
+ /**
+ * CLI action handler.
+ * Print summary in command line
+ * @param options command options
+ * @return false so that Write is not called in non-interactive mode
+ */
+ define boolean MailSummaryHandler (map options) {
+
+ CommandLine::Print (RichText::Rich2Plain (Mail::Summary ()));
+ return false;
+ }
+
+ /**
+ * CLI initializer.
+ * @return whether successful
+ */
+ define boolean MailRead () {
+
+ block<boolean> callback = ``{
+ return false;
+ };
+ return Mail::Read (callback);
+ }
+
+
+ map cmdline_description = $[
+ "id" : "mail",
+ /* Command line help text for the mail module */
+ "help" : _("Configuration of mail"),
+ "guihandler" : MailSequence,
+ "initialize" : MailRead,
+ "finish" : Mail::Write,
+ "actions" : $[
+ "summary" : $[
+ "handler" : MailSummaryHandler,
+ // command line action help
+ "help" : _("Mail configuration summary"),
+ ],
+ ],
+ "mappings" : $[
+ "summary" : [],
+ ]
+ ];
+ /* main ui function */
+ any ret = (preselect_connection_type == nil) ?
+ CommandLine::Run (cmdline_description) : MailSequence ();
+ y2debug ("ret == %1", ret);
+
+ /* Finish */
+ y2milestone ("Mail standard module finished");
+ return ret;
+}
Modified: trunk/mail/src/mail.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.ycp?rev=38213&r1=38212&r2=38213&view=diff
==============================================================================
--- trunk/mail/src/mail.ycp (original)
+++ trunk/mail/src/mail.ycp Wed May 30 20:07:53 2007
@@ -10,6 +10,7 @@
*
* Authors:
* Martin Vidner
+ * Peter Varkoly
*
* $Id$
*
@@ -34,102 +35,167 @@
textdomain "mail";
- import "CommandLine";
- import "Mail";
- import "RichText";
+ import "Wizard";
import "Popup";
import "Label";
- include "mail/ui.ycp";
/* The main () */
y2milestone ("Mail module started");
y2milestone ("----------------------------------------");
- /* parse arguments */
- list args = WFM::Args ();
- string first_arg = args[0]:"";
- if (first_arg == "permanent")
+ /* The maske to select the type of the configuration */
+define string StartDialogHelp () ``{
+ return
+ // Translators: start dialog help, part 1 of 4
+ _("<P><B>Email Server Configuration</B><BR>") +
+ // Translators: start dialog help, part 2 of 4
+ _("<P>This module will configure and start Postfix and if necessary the Cyrus IMAP Server.</P>")+
+ // Translators: start dialog help, part 3 of 4
+ _("<P>Be aware:\nMost home users can use the build-in
+features of their email application to send and
+get email. They do not need this module.</P>")+
+ // Translators: start dialog help, part 4 of 4
+ _("<P>You will need Postfix only if you want to store
+the email on your local system, or in some other special cases.</P>");
+}
+
+define string StartDialog (string type) ``{
+
+ y2milestone ("Mail configuration type %1", type);
+
+ Wizard::SetScreenShotName ("mail-0-start");
+ string caption = _("Email Server Configuration");
+ term tskip_ask = `Left(`CheckBox(`id(`skip_ask), _("Skip this page in the future")));
+ string status = _("Mail Server is not configured.
+Select configuration type according your personal needs");
+ if( type == "standard" )
{
- preselect_connection_type = `permanent;
+ status = _("The running Mail Server configuration is based on type âStandardâ.
+It's possible to change to âAdvancedâ, but this will overwrite all existing settings.");
}
- else if (first_arg == "dialup")
+ else if( type == "advanced" )
{
- preselect_connection_type = `dialup;
+ status = _("The running Mail Server configuration is based on type âAdvancedâ.
+It's possible to change to âStandardâ, but this will overwrite all existing settings.");
}
-
- /**
- * CLI action handler.
- * Print summary in command line
- * @param options command options
- * @return false so that Write is not called in non-interactive mode
- */
- define boolean MailSummaryHandler (map options) {
-
- CommandLine::Print (RichText::Rich2Plain (Mail::Summary ()));
- return false;
+ if( type != "standard" && type != "advanced" )
+ {
+ tskip_ask = `VSpacing(1);
+ }
+ term contents =
+ `Frame(
+ "",
+ `VBox(
+ `Left(`Label(status)),
+ `RadioButtonGroup( `id( `conf_type ),
+ `VBox(
+ `VSpacing(1),
+ `Left(`RadioButton(`id("standard"),_("Standard"), type == "standard" )),
+ `VSpacing(1),
+ `Left(`RadioButton(`id("advanced"),_("Advanced"), type == "advanced" )),
+ `VSpacing(1)
+ )
+ ),
+ tskip_ask,
+ `VSpacing(1)
+ )
+ );
+ Wizard::CreateDialog();
+ Wizard::SetContentsButtons (caption, contents, StartDialogHelp (), Label::BackButton (), Label::NextButton ());
+
+ any ret = nil;
+ string sret = nil;
+ while (true)
+ {
+ ret = UI::UserInput ();
+ if (ret == `cancel)
+ {
+ ret = `abort;
+ }
+
+ if (ret == `back || (ret == `abort ))
+ {
+ break;
+ }
+
+ if (ret == `next )
+ {
+ if( (boolean) UI::QueryWidget (`id (`skip_ask), `Value) )
+ {
+ SCR::Write (.sysconfig.mail.SKIP_ASK, "yes");
+ }
+ else
+ {
+ SCR::Write (.sysconfig.mail.SKIP_ASK, "no");
+ }
+ sret = (string) UI::QueryWidget (`id (`conf_type), `CurrentButton);
+ if( sret == nil )
+ {
+ Popup::Error(_("You have to select a configuration type"));
+ continue;
+ }
+ SCR::Write (.sysconfig.mail.CONFIG_TYPE, sret);
+ y2milestone ("Mail configuration type %1", sret);
+ break;
+ }
}
+ UI::CloseDialog();
+ return sret;
- /**
- * CLI initializer.
- * @return whether successful
- */
- define boolean MailRead () {
+}
+
+ /* parse arguments */
+ list args = WFM::Args ();
- block<boolean> callback = ``{
- return false;
- };
- return Mail::Read (callback);
- }
-
- map cmdline_description = $[
- "id" : "mail",
- /* Command line help text for the mail module */
- "help" : _("Configuration of mail"),
- "guihandler" : MailSequence,
- "initialize" : MailRead,
- "finish" : Mail::Write,
- "actions" : $[
- "summary" : $[
- "handler" : MailSummaryHandler,
- // command line action help
- "help" : _("Mail configuration summary"),
- ],
- ],
- "mappings" : $[
- "summary" : [],
- ]
- ];
-
- /*
- after merging yast2-mail and yast2-mail-server we have to be
- carefull not to corrupt the configuration of the other modul
- */
+ /* we collect some informations from the system */
+ any ret = nil;
+ string skip_ask = "no";
+ string conf_type = "undef";
+ skip_ask = (string) SCR::Read (.sysconfig.mail.SKIP_ASK);
+ conf_type = (string) SCR::Read (.sysconfig.mail.CONFIG_TYPE);
+ boolean first_start = false;
map local_recipient_maps = (map) SCR::Read (.mail.ldaptable, "local_recipient_maps");
-y2milestone("local_recipient_maps: %1",local_recipient_maps);
- if( local_recipient_maps != nil )
+
+ if( conf_type != "advanced" && conf_type != "standard" )
+ { // First start of mail modul or update from < 10.3
+ y2milestone ("Warum bin i here Mail configuration type %1", conf_type);
+ if( local_recipient_maps != nil )
+ { // Postfix configured using LDAP
+ conf_type = "advanced";
+ }
+ else
+ {
+ conf_type = "standard";
+ }
+ first_start = true;
+ }
+ if( skip_ask == "no" || skip_ask == nil )
{
- if(
- ! Popup::AnyQuestionRichText(
- Label::WarningMsg(),
- _("You have configured your MTA with LDAP support.<br>") +
- _("This modul will configure your MTA without LDAP support.<br>") +
- _("This will corrupt your actuall configuration."),
- 80, 10,
- Label::ContinueButton(),
- Label::CancelButton(),
- `focus_no
- )
- )
- {
- return nil;
- }
- }
-
- /* main ui function */
- any ret = (preselect_connection_type == nil) ?
- CommandLine::Run (cmdline_description) : MailSequence ();
+ string old_conf = conf_type;
+ conf_type = StartDialog(conf_type);
+ if( conf_type == nil )
+ {
+ y2milestone("no mail server configuration type");
+ return ret;
+ }
+ if( old_conf != conf_type )
+ {
+ first_start = true;
+ }
+ }
- y2debug ("ret == %1", ret);
+ if( conf_type == "advanced" )
+ {
+ if( first_start )
+ {
+ args[size(args)] = "setup";
+ }
+ ret = WFM::CallFunction("mail-advanced",args);
+ }
+ else
+ {
+ ret = WFM::CallFunction("mail-standard",args);
+ }
/* Finish */
y2milestone ("Mail module finished");
Added: trunk/mail/src/sysconfig.mail
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/sysconfig.mail?rev=38213&view=auto
==============================================================================
--- trunk/mail/src/sysconfig.mail (added)
+++ trunk/mail/src/sysconfig.mail Wed May 30 20:07:53 2007
@@ -0,0 +1,49 @@
+## Path: Network/Mail/General
+## Description:
+## Type: string
+## Default: ""
+## Config: postfix
+## ServiceReload: sendmail,postfix
+#
+# From:-Line in email and News postings
+# (otherwise the FQDN is used)
+#
+FROM_HEADER=""
+
+## Path: Network/Mail/General
+## Description: Basic general MTA configuration
+## Type: yesno
+## Default: yes
+## Config: postfix,sendmail
+#
+# If you don't want to let SuSEconfig generate your
+# configuration file, set this to no
+#
+MAIL_CREATE_CONFIG="yes"
+
+## Type: yesno
+## Default: no
+## Config: postfix
+#
+# Set this to "yes" if mail from remote should be accepted
+# this is necessary for any mail server.
+# If set to "no" or empty then only mail from localhost
+# will be accepted.
+#
+SMTPD_LISTEN_REMOTE="yes"
+
+## Type: yesno
+## Default: no
+#
+# Set this to "yes" if the yast2 mail module must not
+# start with the with the vizard for asking the
+# configuration type of the mail server.
+#
+MAIL_SKIP_ASK="no"
+
+## Type: string(standard,advanced,undef)
+## Default: undef
+#
+# This variable contains the type of the mail server configuration.
+#
+MAIL_CONF_TYPE="undef"
Modified: trunk/mail/users-plugin/Makefile.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/users-plugin/Makefile.in?rev=38213&r1=38212&r2=38213&view=diff
==============================================================================
--- trunk/mail/users-plugin/Makefile.in (original)
+++ trunk/mail/users-plugin/Makefile.in Wed May 30 20:07:53 2007
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -19,15 +19,11 @@
# Makefile.am.common -*- Makefile -*-
# Generated file, do not edit!
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -72,15 +68,12 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-CREATE_PKGCONFIG_FALSE = @CREATE_PKGCONFIG_FALSE@
-CREATE_PKGCONFIG_NOARCH_FALSE = @CREATE_PKGCONFIG_NOARCH_FALSE@
-CREATE_PKGCONFIG_NOARCH_TRUE = @CREATE_PKGCONFIG_NOARCH_TRUE@
-CREATE_PKGCONFIG_TRUE = @CREATE_PKGCONFIG_TRUE@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -91,6 +84,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINTAINER = @MAINTAINER@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MYEXPECT = @MYEXPECT@
MYRUNTEST = @MYRUNTEST@
PACKAGE = @PACKAGE@
@@ -112,10 +106,14 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
-ac_ct_STRIP = @ac_ct_STRIP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
agentdir = @agentdir@
am__leading_dot = @am__leading_dot@
am__tar = @am__tar@
@@ -126,10 +124,13 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
clientdir = @clientdir@
datadir = @datadir@
+datarootdir = @datarootdir@
desktopdir = @desktopdir@
docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
execcompdir = @execcompdir@
fillupdir = @fillupdir@
@@ -138,6 +139,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
imagedir = @imagedir@
includedir = @includedir@
infodir = @infodir@
@@ -150,16 +152,19 @@
mkdir_p = @mkdir_p@
moduledir = @moduledir@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
pkgconfigdatadir = @pkgconfigdatadir@
pkgconfigdir = @pkgconfigdir@
plugindir = @plugindir@
potdir = @potdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
schemadir = @schemadir@
scrconfdir = @scrconfdir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
@@ -167,6 +172,8 @@
target_os = @target_os@
target_vendor = @target_vendor@
themedir = @themedir@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
yast2dir = @yast2dir@
ybindir = @ybindir@
ydatadir = @ydatadir@
@@ -192,6 +199,7 @@
# where ycpchook contains a symlink to "."
# Otherwise "." keeps being newer than .dep and we loop.
NEWDEP = ${top_builddir}/.dep.new
+CHECK_SYNTAX = true
all: all-am
.SUFFIXES:
@@ -224,10 +232,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
install-clientDATA: $(client_DATA)
@$(NORMAL_INSTALL)
- test -z "$(clientdir)" || $(mkdir_p) "$(DESTDIR)$(clientdir)"
+ test -z "$(clientdir)" || $(MKDIR_P) "$(DESTDIR)$(clientdir)"
@list='$(client_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -244,7 +251,7 @@
done
install-moduleDATA: $(module_DATA)
@$(NORMAL_INSTALL)
- test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)"
+ test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
@list='$(module_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -261,7 +268,7 @@
done
install-modulebinDATA: $(modulebin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(modulebindir)" || $(mkdir_p) "$(DESTDIR)$(modulebindir)"
+ test -z "$(modulebindir)" || $(MKDIR_P) "$(DESTDIR)$(modulebindir)"
@list='$(modulebin_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -284,23 +291,21 @@
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/..
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -319,7 +324,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -368,12 +373,20 @@
install-data-am: install-clientDATA install-moduleDATA \
install-modulebinDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -392,19 +405,23 @@
ps-am:
-uninstall-am: uninstall-clientDATA uninstall-info-am \
- uninstall-moduleDATA uninstall-modulebinDATA
+uninstall-am: uninstall-clientDATA uninstall-moduleDATA \
+ uninstall-modulebinDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic dist-hook \
distclean distclean-generic distdir dvi dvi-am html html-am \
info info-am install install-am install-clientDATA \
- install-data install-data-am install-exec install-exec-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-moduleDATA \
- install-modulebinDATA install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am uninstall-clientDATA \
- uninstall-info-am uninstall-moduleDATA uninstall-modulebinDATA
+ install-modulebinDATA install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-clientDATA uninstall-moduleDATA \
+ uninstall-modulebinDATA
# suffix mapping: info '(make)Static Usage'
@@ -420,9 +437,19 @@
rm ${NEWDEP}
dist-hook: check-syntax
-
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
-include .dep
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
varkoly＠svn.opensuse.org