[Fedora-directory-commits] dsbuild/ds/adminserver .cvsignore, NONE, 1.1 Makefile, 1.9, 1.10 checksums, 1.11, 1.12
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/adminserver
Modified Files:
Makefile checksums
Added Files:
.cvsignore
Log Message:
updated for Fedora DS 1.1
--- NEW FILE .cvsignore ---
download
work
cookies
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminserver/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile 6 Nov 2006 21:51:27 -0000 1.9
+++ Makefile 8 Feb 2008 21:51:51 -0000 1.10
@@ -1,55 +1,44 @@
include ../../objdirname.mk
-GARNAME = fedora-adminserver
-GARVERSION = 1.0.3
+GARNAME = fedora-ds-admin
+GARVERSION = 1.1.1
CATEGORIES = ds
PATCHFILES =
ifdef USE_CVS
CVSMODULES=adminserver
else
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
endif
LIBDEPS =
-DESCRIPTION = adminserver
+DESCRIPTION = Fedora DS Admin Server
-#CONFIGURE_SCRIPTS = $(WORKSRC)/configure
-BUILD_SCRIPTS = $(WORKSRC)/Makefile
-#INSTALL_SCRIPTS = $(WORKSRC)/Makefile
-INSTALL_SCRIPTS = custom
-
-BUILD_ARGS = MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \
- MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) \
- ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \
- ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.4 \
- SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.3 \
- ONLINEHELP_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/onlinehelp/work/fedora-onlinehelp-1.0.3 \
- MOD_ADMSERV_LIBPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_admserv/work/mod_admserv-1.0.3/.libs \
- MOD_RESTARTD_LIBPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_restartd/work/mod_restartd-1.0.3/.libs \
- MOD_NSS_LIBPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.5/.libs \
- MOD_NSS_BINPATH=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.5
-
-ifndef NOJAVA
-BUILD_ARGS += CONSOLE_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/console/work \
- ADMSERVCONSOLE_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/admservconsole/work
-endif # NOJAVA
+CONFIGURE_SCRIPTS = $(WORKSRC)/configure
+CONFIGURE_ARGS = $(DS_CONFIGURE_ARGS) --enable-bundle
+ifdef APR_CONFIG
+CONFIGURE_ARGS += --with-apr-config=$(APR_CONFIG)
+endif
+ifdef APXS
+CONFIGURE_ARGS += --with-apxs=$(APXS)
+CONFIGURE_ENV += CPPFLAGS="$(shell $(APXS) -q CPPFLAGS)"
+endif
+ifdef HTTPD
+CONFIGURE_ARGS += --with-httpd=$(HTTPD)
+endif
-ifneq ($(DEBUG), full)
-BUILD_ARGS += BUILD_DEBUG=optimize
+ifdef MOD_NSS_SOURCE
+CONFIGURE_ARGS += --with-modnss-lib=$(DESTDIR)$(PREFIX)/lib/dirsrv/modules --with-modnss-bin=$(DESTDIR)$(PREFIX)/sbin
endif
+BUILD_SCRIPTS = $(WORKSRC)/Makefile
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile
+
ifdef USE_CVS
post-extract: extract-cvs
endif
-configure-custom:
- $(MAKECOOKIE)
-
-install-custom:
- $(MAKECOOKIE)
-
include ../../gar.conf.mk
include ../category.mk
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminserver/checksums,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- checksums 16 Oct 2006 15:59:14 -0000 1.11
+++ checksums 8 Feb 2008 21:51:51 -0000 1.12
@@ -1 +1 @@
-c4c209e2c387a41d8519a52cbe9323a6 download/fedora-adminserver-1.0.3.tar.gz
+f50f2b6c983851c5e912047807bbcca6 download/fedora-ds-admin-1.1.1.tar.bz2
16 years, 2 months
[Fedora-directory-commits] dsbuild ds.conf.mk,1.2,1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545
Modified Files:
ds.conf.mk
Log Message:
updated for Fedora DS 1.1
Index: ds.conf.mk
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds.conf.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ds.conf.mk 8 Apr 2006 19:26:49 -0000 1.2
+++ ds.conf.mk 8 Feb 2008 21:51:51 -0000 1.3
@@ -1,15 +1,15 @@
-MASTER_SITES += http://directory.fedora.redhat.com/sources/
-MASTER_SITES += http://directory.fedora.redhat.com/download/
+MASTER_SITES += http://directory.fedoraproject.org/sources/
+MASTER_SITES += http://directory.fedoraproject.org/download/
# DSMLGWJAR_VERSION is defined in ds/dsmlgwjars/Makefile
ifdef DSMLGWJAR_VERSION
-MASTER_SITES += http://directory.fedora.redhat.com/download/dsmlgwjars-$(DSMLGWJAR_VERSION)/
+MASTER_SITES += http://directory.fedoraproject.org/download/dsmlgwjars-$(DSMLGWJAR_VERSION)/
endif
# cvs information
# use USE_CVS=1 on the make command line to grab the sources from CVS
# instead of from the checksummed source tarballs
# fedora anon cvs
-FEDCVSROOT=:pserver:anonymous@cvs.fedora.redhat.com:/cvs/dirsec
+FEDCVSROOT=:pserver:anonymous@cvs.fedoraproject.org:/cvs/dirsec
# mozilla anon cvs
MOZCVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
# default to fedora for now since the mozilla sources are more static
@@ -18,3 +18,71 @@
CVSTAG=HEAD
# each ds/*/Makefile must define the CVS modules e.g.
#CVSMODULES=ldapserver
+
+# override this if you do not have GNU install
+INSTALL=install
+
+# common args to be passed to configure
+DS_CONFIGURE_ARGS =
+
+ifdef PREFIX
+CONFIGURE_ARGS += --prefix=$(PREFIX)
+DS_CONFIGURE_ARGS += --prefix=$(PREFIX)
+endif
+
+ifeq ($(USE_64), 1)
+CONFIGURE_OPTS += --enable-64bit
+endif
+
+ifndef CFLAGS
+ifdef DEBUG
+CFLAGS=-g
+else
+CFLAGS=-O2
+endif
+endif
+
+CONFIGURE_ENV += CFLAGS=$(CFLAGS)
+
+# component information
+ifdef NSPR_SOURCE
+export NSPR_INCLUDE_DIR=$(DESTDIR)$(PREFIX)/include/nspr4
+export NSPR_LIB_DIR=$(DESTDIR)$(PREFIX)/lib
+DS_CONFIGURE_ARGS += --with-nspr-inc=$(NSPR_INCLUDE_DIR) --with-nspr-lib=$(NSPR_LIB_DIR)
+endif
+
+ifdef NSS_SOURCE
+export NSS_INCLUDE_DIR=$(DESTDIR)$(PREFIX)/include/nss3
+export NSS_LIB_DIR=$(DESTDIR)$(PREFIX)/lib
+DS_CONFIGURE_ARGS += --with-nss-inc=$(NSS_INCLUDE_DIR) --with-nss-lib=$(NSS_LIB_DIR)
+endif
+
+ifdef SVRCORE_SOURCE
+DS_CONFIGURE_ARGS += --with-svrcore-inc=$(DESTDIR)$(PREFIX)/include --with-svrcore-lib=$(DESTDIR)$(PREFIX)/lib
+endif
+
+ifdef SASL_SOURCE
+DS_CONFIGURE_ARGS += --with-sasl=$(DESTDIR)$(PREFIX)
+else
+DS_CONFIGURE_ARGS += --with-sasl
+endif
+
+ifdef MOZLDAP_SOURCE
+DS_CONFIGURE_ARGS += --with-ldapsdk=$(DESTDIR)$(PREFIX)
+endif
+
+ifdef ICU_SOURCE
+DS_CONFIGURE_ARGS += --with-icu=$(DESTDIR)$(PREFIX)
+endif
+
+ifdef DB_SOURCE
+DS_CONFIGURE_ARGS += --with-db=$(DESTDIR)$(PREFIX)
+endif
+
+ifdef SNMP_SOURCE
+DS_CONFIGURE_ARGS += --with-netsnmp=$(DESTDIR)$(PREFIX)
+endif
+
+ifdef ADMINUTIL_SOURCE
+DS_CONFIGURE_ARGS += --with-adminutil=$(DESTDIR)$(PREFIX)
+endif
16 years, 2 months