Author: nhosoi
Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20804
Modified Files: Makefile.am Makefile.in Log Message: resolves: #249739 Summary: Implement a script registering DS to the Configuration DS (comment #1-4)
Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/adminserver/Makefile.am,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Makefile.am 11 Jul 2007 01:20:21 -0000 1.23 +++ Makefile.am 27 Jul 2007 01:42:46 -0000 1.24 @@ -161,18 +161,22 @@ ds_start ds_restart ds_shutdown ds_ldif2db ds_db2ldif ds_bak2db \ ds_db2bak ds_listdb ds_rmdb ds_snmpctrl ds_vlvindex ds_addindex
-bin_SCRIPTS = admserv/newinst/src/register_server.pl cgibin_SCRIPTS = admserv/cgi-src40/ds_create admserv/cgi-src40/ds_remove -nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin +nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin \ + admserv/cfgstuff/stop-ds-admin \ + admserv/cfgstuff/restart-ds-admin \ + admserv/cfgstuff/ds_removal
cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \ - admserv/newinst/src/migrate-ds-admin.pl + admserv/newinst/src/migrate-ds-admin.pl \ + admserv/newinst/src/register-ds-admin.pl
perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm \ admserv/newinst/src/AdminUtil.pm \ admserv/newinst/src/AdminServer.pm \ admserv/newinst/src/ConfigDSDialogs.pm \ - admserv/newinst/src/AdminMigration.pm + admserv/newinst/src/AdminMigration.pm \ + admserv/newinst/src/RegDSDialogs.pm
libds_admin_serv_la_SOURCES = $(libbase_a_SOURCES) $(libsi18n_a_SOURCES) $(libadmin_a_SOURCES) libds_admin_serv_la_LINK = $(MYLINK) @@ -370,6 +374,7 @@ # regular property files go here property_DATA = admserv/newinst/src/setup-ds-admin.res \ admserv/newinst/src/migrate-ds-admin.res \ + admserv/newinst/src/register-ds-admin.res \ admserv/cgi-src40/ds_create.res \ admserv/cgi-src40/ds_remove.res
Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/adminserver/Makefile.in,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Makefile.in 11 Jul 2007 01:20:21 -0000 1.23 +++ Makefile.in 27 Jul 2007 01:42:46 -0000 1.24 @@ -99,13 +99,13 @@ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" \ - "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cgibindir)" \ - "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" \ - "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" \ - "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" \ - "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" \ - "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" \ - "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" + "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" \ + "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" \ + "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" \ + "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" \ + "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" \ + "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" \ + "$(DESTDIR)$(propertydir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libds_admin_serv_la_LIBADD = @@ -238,14 +238,13 @@ am_viewlog_OBJECTS = admserv/cgi-src40/viewlog.$(OBJEXT) viewlog_OBJECTS = $(am_viewlog_OBJECTS) viewlog_DEPENDENCIES = $(am__DEPENDENCIES_2) -binSCRIPT_INSTALL = $(INSTALL_SCRIPT) cgibinSCRIPT_INSTALL = $(INSTALL_SCRIPT) cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) initSCRIPT_INSTALL = $(INSTALL_SCRIPT) nodist_cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) perlSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(bin_SCRIPTS) $(cgibin_SCRIPTS) $(cmdbin_SCRIPTS) \ - $(init_SCRIPTS) $(nodist_cmdbin_SCRIPTS) $(perl_SCRIPTS) +SCRIPTS = $(cgibin_SCRIPTS) $(cmdbin_SCRIPTS) $(init_SCRIPTS) \ + $(nodist_cmdbin_SCRIPTS) $(perl_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -588,17 +587,22 @@ admserv/newinst/src/dirserver.map \ admserv/newinst/src/asmigrate.map
-bin_SCRIPTS = admserv/newinst/src/register_server.pl cgibin_SCRIPTS = admserv/cgi-src40/ds_create admserv/cgi-src40/ds_remove -nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin +nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin \ + admserv/cfgstuff/stop-ds-admin \ + admserv/cfgstuff/restart-ds-admin \ + admserv/cfgstuff/ds_removal + cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \ - admserv/newinst/src/migrate-ds-admin.pl + admserv/newinst/src/migrate-ds-admin.pl \ + admserv/newinst/src/register-ds-admin.pl
perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm \ admserv/newinst/src/AdminUtil.pm \ admserv/newinst/src/AdminServer.pm \ admserv/newinst/src/ConfigDSDialogs.pm \ - admserv/newinst/src/AdminMigration.pm + admserv/newinst/src/AdminMigration.pm \ + admserv/newinst/src/RegDSDialogs.pm
libds_admin_serv_la_SOURCES = $(libbase_a_SOURCES) $(libsi18n_a_SOURCES) $(libadmin_a_SOURCES) libds_admin_serv_la_LINK = $(MYLINK) @@ -775,6 +779,7 @@ # regular property files go here property_DATA = admserv/newinst/src/setup-ds-admin.res \ admserv/newinst/src/migrate-ds-admin.res \ + admserv/newinst/src/register-ds-admin.res \ admserv/cgi-src40/ds_create.res \ admserv/cgi-src40/ds_remove.res
@@ -1272,25 +1277,6 @@ viewlog$(EXEEXT): $(viewlog_OBJECTS) $(viewlog_DEPENDENCIES) @rm -f viewlog$(EXEEXT) $(viewlog_LINK) $(viewlog_LDFLAGS) $(viewlog_OBJECTS) $(viewlog_LDADD) $(LIBS) -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ - else :; fi; \ - done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done install-cgibinSCRIPTS: $(cgibin_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(cgibindir)" || $(mkdir_p) "$(DESTDIR)$(cgibindir)" @@ -2540,7 +2526,7 @@ $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive @@ -2612,7 +2598,7 @@ @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook
-install-exec-am: install-binSCRIPTS install-libLTLIBRARIES +install-exec-am: install-libLTLIBRARIES
install-info: install-info-recursive
@@ -2640,14 +2626,14 @@
ps-am:
-uninstall-am: uninstall-binSCRIPTS uninstall-cgibinPROGRAMS \ - uninstall-cgibinSCRIPTS uninstall-cmdbinSCRIPTS \ - uninstall-dist_helpDATA uninstall-dist_htmlDATA \ - uninstall-dist_iconDATA uninstall-infDATA uninstall-info-am \ - uninstall-initSCRIPTS uninstall-ldifDATA \ - uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \ - uninstall-nodist_configDATA uninstall-nodist_propertyDATA \ - uninstall-perlSCRIPTS uninstall-propertyDATA +uninstall-am: uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \ + uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \ + uninstall-dist_htmlDATA uninstall-dist_iconDATA \ + uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \ + uninstall-ldifDATA uninstall-libLTLIBRARIES \ + uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \ + uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \ + uninstall-propertyDATA
uninstall-info: uninstall-info-recursive
@@ -2659,12 +2645,11 @@ distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-recursive distclean-tags \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-binSCRIPTS \ - install-cgibinPROGRAMS install-cgibinSCRIPTS \ - install-cmdbinSCRIPTS install-data install-data-am \ - install-data-hook install-dist_helpDATA install-dist_htmlDATA \ - install-dist_iconDATA install-exec install-exec-am \ - install-infDATA install-info install-info-am \ + html-am info info-am install install-am install-cgibinPROGRAMS \ + install-cgibinSCRIPTS install-cmdbinSCRIPTS install-data \ + install-data-am install-data-hook install-dist_helpDATA \ + install-dist_htmlDATA install-dist_iconDATA install-exec \ + install-exec-am install-infDATA install-info install-info-am \ install-initSCRIPTS install-ldifDATA install-libLTLIBRARIES \ install-man install-nodist_cmdbinSCRIPTS \ install-nodist_configDATA install-nodist_propertyDATA \ @@ -2674,14 +2659,14 @@ maintainer-clean-recursive mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-binSCRIPTS uninstall-cgibinPROGRAMS \ - uninstall-cgibinSCRIPTS uninstall-cmdbinSCRIPTS \ - uninstall-dist_helpDATA uninstall-dist_htmlDATA \ - uninstall-dist_iconDATA uninstall-infDATA uninstall-info-am \ - uninstall-initSCRIPTS uninstall-ldifDATA \ - uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \ - uninstall-nodist_configDATA uninstall-nodist_propertyDATA \ - uninstall-perlSCRIPTS uninstall-propertyDATA + uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \ + uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \ + uninstall-dist_htmlDATA uninstall-dist_iconDATA \ + uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \ + uninstall-ldifDATA uninstall-libLTLIBRARIES \ + uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \ + uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \ + uninstall-propertyDATA
define NL \n
389-commits@lists.fedoraproject.org
-
Doctor Conrad