Attachment 156614 Details for Bug 237356 – diffs to add setup perl support to adminserver

[patch] diffs to add setup perl support to adminserver

cvsdiffs (text/plain), 5.46 KB, created by Rich Megginson on 2007-06-08 20:51:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-06-08 20:51:53 UTC

Size: 5.46 KB

patch

obsolete

>Index: adminserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/adminserver/Makefile.am,v
>retrieving revision 1.6
>diff -u -8 -r1.6 Makefile.am
>--- adminserver/Makefile.am	21 May 2007 15:52:25 -0000	1.6
>+++ adminserver/Makefile.am	8 Jun 2007 20:51:13 -0000
>@@ -76,16 +76,17 @@
> pidfile = @pidfile@
> logdir = $(localstatedir)@logdir@/$(instancename)
> HTTPD = @HTTPD@
> httpduser = @httpduser@
> modnssbindir = @modnssbindir@
> ldifdir = $(datadir)@ldifdir@
> admmoddir = $(libdir)@admmoddir@
> infdir = $(datadir)@infdir@
>+perldir = $(libdir)@perldir@
> 
> libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \
> 	lib/base/system.cpp lib/base/nscputil.cpp
> 
> libsi18n_a_SOURCES = lib/libsi18n/coreres.c lib/libsi18n/getlang.c \
> 	lib/libsi18n/getstrprop.c lib/libsi18n/propset.c lib/libsi18n/reshash.c lib/libsi18n/txtfile.c
> 
> libadmin_a_SOURCES = lib/libadmin/cluster.c lib/libadmin/dllglue.c \
>@@ -122,18 +123,22 @@
> 
> cgibin_PROGRAMS = mergeConfig admpw security ugdsconfig ReadLog start_config_ds \
> 	config statpingserv viewdata dsconfig monreplication restartsrv \
> 	statusping viewlog htmladmin sec-activate stopsrv download help
> 
> cgibin_SCRIPTS = admserv/cgi-src40/Cgi.pm
> nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin
> 
>+cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl
>+
> cmdbin_PROGRAMS = ds-admin-config ds-admin-remove ds-admin-update  
> 
>+perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm
>+
> libds_admin_serv_la_SOURCES = $(libbase_a_SOURCES) $(libsi18n_a_SOURCES) $(libadmin_a_SOURCES)
> 
> # source files for our CGI programs
> download_SOURCES = admserv/cgi-src40/download.c
> 
> help_SOURCES = admserv/cgi-src40/help.c
> start_config_ds_SOURCES = admserv/cgi-src40/start_config_ds.c
> admpw_SOURCES = admserv/cgi-src40/admpw.c
>@@ -239,18 +244,20 @@
> 	admserv/cgi-src40/stopsrv_root.res \
> 	admserv/cgi-src40/dsconfig_root.res admserv/cgi-src40/monreplication_root.res \
> 	admserv/cgi-src40/ugdsconfig_root.res admserv/cgi-src40/htmladmin_root.res \
> 	admserv/cgi-src40/restartsrv_root.res admserv/cgi-src40/viewdata_root.res \
> 	admserv/cgi-src40/sec-activate_root.res \
> 	admserv/cgi-src40/viewlog_root.res
> 
> MOSTLYCLEANFILES += $(RESOURCE_BUNDLES_ROOT)
>-# property file installation is handled specially
>+# ICU resource file installation is handled specially
> nodist_property_DATA = $(RESOURCE_BUNDLES_ROOT)
>+# regular property files go here
>+property_DATA = admserv/newinst/src/setup-ds-admin.res
> 
> # French resource bundles (for the French localization in the future)
> #RESOURCE_BUNDLES_FR = foo_fr.res
> 
> # German resource bundles (for the German localization in the future)
> #RESOURCE_BUNDLES_DE = foo_de.res
> 
> %_root.res : %.properties
>@@ -265,16 +272,17 @@
> # these are for the config files and scripts that we need to generate and replace
> # the paths and other tokens with the real values set during configure/make
> # note that we cannot just use AC_OUTPUT to do this for us, since it will do things like this:
> # ADMConfigDir = ${prefix}/etc/packagename
> # i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead:
> # ADMConfigDir = /etc/packagename
> fixupcmd = sed \
> 	-e 's,@HTTPD\@,$(HTTPD),g' \
>+	-e 's,@bindir\@,$(bindir),g' \
> 	-e 's,@cgibindir\@,$(cgibindir),g' \
> 	-e 's,@cmdbindir\@,$(cmdbindir),g' \
> 	-e 's,@moddir\@,$(moddir),g' \
> 	-e 's,@modnssbindir\@,$(modnssbindir),g' \
> 	-e 's,@propertydir\@,$(propertydir),g' \
> 	-e 's,@htmldir\@,$(htmldir),g' \
> 	-e 's,@icondir\@,$(icondir),g' \
> 	-e 's,@logdir\@,$(logdir),g' \
>@@ -298,17 +306,18 @@
> 	-e 's,@instconfigdir\@,$(instconfigdir),g' \
> 	-e 's,@instancename\@,$(instancename),g' \
> 	-e 's,@BUILD_NUM\@,$(BUILDNUM),g' \
> 	-e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
> 	-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
> 	-e 's,@brand\@,$(brand),g' \
> 	-e 's,@capbrand\@,$(capbrand),g' \
> 	-e 's,@vendor\@,$(vendor),g' \
>-	-e 's,@mimemagic\@,$(mimemagic),g'
>+	-e 's,@mimemagic\@,$(mimemagic),g' \
>+	-e 's,@perldir\@,$(perldir),g'
> 
> # because the source may be either httpd.conf.in or httpd-2.2.conf.in
> admserv/cfgstuff/httpd.conf: $(HTTPD_CONF_SRC)
> 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
> 	$(fixupcmd) $< > $@
> 
> % : %.in
> 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
>Index: adminserver/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/adminserver/configure.ac,v
>retrieving revision 1.4
>diff -u -8 -r1.4 configure.ac
>--- adminserver/configure.ac	21 May 2007 15:52:25 -0000	1.4
>+++ adminserver/configure.ac	8 Jun 2007 20:51:13 -0000
>@@ -137,16 +137,19 @@
> pidfile=$instancename.pid
> # location of property/resource files, relative to datadir
> propertydir=/$PACKAGE_BASE_NAME/properties
> 
> # where our private Apache modules will go
> # relative to libdir
> admmoddir=/$PACKAGE_BASE_NAME/modules
> 
>+# relative to libdir
>+perldir=/$PACKAGE_BASE_NAME/perl
>+
> # write out paths for binary components
> AC_SUBST(PACKAGE_BASE_NAME)
> AC_SUBST(nspr_inc)
> AC_SUBST(nspr_lib)
> AC_SUBST(nspr_libdir)
> AC_SUBST(nss_inc)
> AC_SUBST(nss_lib)
> AC_SUBST(nss_libdir)
>@@ -186,16 +189,17 @@
> AC_SUBST(piddir)
> AC_SUBST(pidfile)
> AC_SUBST(admservport)
> AC_SUBST(HTTPD)
> AC_SUBST(ldifdir)
> AC_SUBST(admmoddir)
> AC_SUBST(nssmoddir)
> AC_SUBST(infdir)
>+AC_SUBST(perldir)
> 
> AC_SUBST(brand)
> AC_SUBST(capbrand)
> AC_SUBST(vendor)
> 
> # WINNT should be true if building on Windows system not using
> # cygnus, mingw, or the like and using cmd.exe as the shell
> AM_CONDITIONAL([WINNT], false)

Actions: View | Diff

Attachments on bug 237356: 153230 | 153562 | 153667 | 153668 | 153674 | 153675 | 153677 | 153678 | 155103 | 155105 | 155406 | 155407 | 155408 | 155409 | 155410 | 155411 | 155412 | 155413 | 155414 | 155483 | 155484 | 155485 | 155486 | 155487 | 155488 | 155489 | 155490 | 156389 | 156510 | 156525 | 156539 | 156540 | 156541 | 156612 | 156613 | 156614 | 156626 | 156633 | 156634 | 156741 | 156829 | 156834 | 156839 | 156840 | 156895 | 157043 | 157044 | 157133 | 157159 | 157160 | 157164 | 157165 | 157167 | 157298 | 157378 | 157381 | 157388 | 157390 | 157400 | 157401 | 157407 | 157408 | 157429 | 157431 | 157469 | 157471 | 157479 | 157480 | 160762