[Fedora-directory-commits] directoryconsole build.properties, 1.3, 1.4 build.xml, 1.4, 1.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/directoryconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28277
Modified Files:
build.properties build.xml
Log Message:
Changed the ldapconsole package name to <brand>-ds-<version>.jar
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.properties 13 Feb 2006 22:00:39 -0000 1.3
+++ build.properties 22 Mar 2006 17:46:10 -0000 1.4
@@ -21,6 +21,6 @@
lang=en
ldapconsole.root=..
-ldapconsole.version=10
-ldapconsole.name=ds${ldapconsole.version}
+ldapconsole.version=1.0
brand=fedora
+ldapconsole.name=${brand}-ds-${ldapconsole.version}
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 13 Feb 2006 22:00:39 -0000 1.4
+++ build.xml 22 Mar 2006 17:46:10 -0000 1.5
@@ -68,8 +68,10 @@
dest="${imports.dir}/console/${console.import}"/>
<!-- Extract console -->
<untar src="${imports.dir}/console/${console.import}"
- dest="${imports.dir}/console/unzipped"
+ dest="${imports.dir}/console"
compression="gzip"/>
+ <move file="${imports.dir}/console/${brand}-console-${ldapconsole.version}"
+ todir="${imports.dir}/console/unzipped"/>
<!-- Set console.location -->
<property name="console.location" value="${imports.dir}/console/unzipped"/>
</target>
18 years
[Fedora-directory-commits] adminserver/lib/base file.cpp,1.5,1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/lib/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12329/lib/base
Modified Files:
file.cpp
Log Message:
[186105] Admin Server Makefile updates for Internal build
javarules.mk: changed to use the appropriate version of JDKs
file.cpp: changed use strerror instead of sys_errlist
Index: file.cpp
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/base/file.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- file.cpp 18 Aug 2005 19:18:27 -0000 1.5
+++ file.cpp 21 Mar 2006 22:23:50 -0000 1.6
@@ -497,14 +497,6 @@
return 0;
}
-#ifdef XP_UNIX
-#ifdef LINUX
-extern const char *const sys_errlist[];
-#else
-extern char *sys_errlist[];
-#endif
-#endif
-
#define ERRMSG_SIZE 35
#include "util.h"
@@ -561,7 +553,7 @@
lmsg = system_winerr();
SetLastError(0);
#else
- lmsg = (char *)sys_errlist[errno];
+ lmsg = strerror(errno);
errno = 0;
#endif
}
18 years
[Fedora-directory-commits] adminserver/admserv/console javarules.mk, 1.5, 1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12329/admserv/console
Modified Files:
javarules.mk
Log Message:
[186105] Admin Server Makefile updates for Internal build
javarules.mk: changed to use the appropriate version of JDKs
file.cpp: changed use strerror instead of sys_errlist
Index: javarules.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/javarules.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- javarules.mk 9 Sep 2005 18:46:01 -0000 1.5
+++ javarules.mk 21 Mar 2006 22:23:38 -0000 1.6
@@ -26,6 +26,10 @@
# Identify tools, directories, classpath for building the Admin
# console
+BUILD_ROOT=$(shell cd ../..;pwd)
+
+include $(BUILD_ROOT)/nsconfig.mk
+
# Java setup ##############################################
# disable optimized builds for now until we can figure out why
@@ -39,9 +43,9 @@
PATH_SEP := :
ifeq ($(OS), Windows_NT)
- GET_JAVA_FROM_PATH := 1
- PATH_SEP := ;
- EXE_SUFFIX := .exe
+ GET_JAVA_FROM_PATH := 1
+ PATH_SEP := ;
+ EXE_SUFFIX := .exe
endif
# For NT, assume a locally installed JDK
@@ -50,42 +54,32 @@
JDKCOMP := $(shell which javac)
JDKPRELIB := $(subst bin/javac$(EXE_SUFFIX),lib,$(JDKCOMP))
JDKLIB := $(addprefix $(JDKPRELIB)/,tools.jar)
-else
+
+else # !GET_JAVA_FROM_PATH
# For UNIX, use JDK and JAR files over NFS
# Use NT classes.zip; doesn't matter that it was compiled on NT
#
-# Version 1.4.0_01 of the JDK does not seem to run well on RHEL 3.0
ifeq ($(ARCH), Linux)
- JDK_VERSION=1.4.2
+ JDK_BASE=ibmjdk
+ JDK_VERSION=1.4.2_SR3
+ JDK_VERSDIR=$(JDK_VERSION)/$(NSOBJDIR_NAME)
else
- ifeq ($(ARCH), HPUX)
- JDK_VERSION=1.4.1_05
- else
- JDK_VERSION=1.4.0_01
- endif
+ ifeq ($(ARCH), HPUX)
+ JDK_BASE=hpjdk
+ JDK_VERSION=1.4.2_09
+ JDK_VERSDIR=$(JDK_VERSION)
+ else
+ JDK_BASE=jdk
+ JDK_VERSION=1.4.2_10
+ JDK_VERSDIR=$(JDK_VERSION)/$(NSOBJDIR_NAME)
+ endif
endif
- JDK_VERSDIR=jdk$(JDK_VERSION)
- JDKLIB=/share/builds/components/jdk/$(JDK_VERSION)/$(PRETTY_ARCH)/lib/tools.jar
- ifeq ($(NSOS_ARCH), IRIX)
-# Get IRIX compiler from tools directory, currently 1.1.3
- JAVABINDIR=/tools/ns/bin
- else
- ifeq ($(ARCH), AIX)
-# Get AIX compiler from tools directory, currently 1.1.2
- JAVABINDIR=/tools/ns/bin
- else
- ifeq ($(ARCH), OSF1)
- JAVABINDIR=/share/builds/components/jdk/1.1.6beta/OSF1/bin
- else
-# Solaris, Linux, HP/UX and any others:
- JDK_DIR=$(COMPONENTS_DIR)/jdk
- JAVABINDIR=$(JDK_DIR)/$(JDK_VERSION)/$(PRETTY_ARCH)/bin
- endif
- endif
- endif
-endif
+ JDK_DIR=$(COMPONENTS_DIR)/$(JDK_BASE)
+ JDKLIB=$(JDK_DIR)/$(JDK_VERSDIR)/lib/tools.jar
+ JAVABINDIR=$(JDK_DIR)/$(JDK_VERSDIR)/bin
+endif # GET_JAVA_FROM_PATH
CLASSPATH := $(JAVA_SRC_DIR)$(PATH_SEP)$(NMCLFJARFILE)$(PATH_SEP)$(LDAPJARFILE)$(PATH_SEP)$(MCCJARFILE)$(PATH_SEP)$(JAVASSLJARFILE)$(PATH_SEP)$(BASEJARFILE)$(PATH_SEP)$(JSSJARFILE)
#CLASSPATH := $(JAVA_SRC_DIR)$(PATH_SEP)$(SWINGJARFILE)$(PATH_SEP)$(NMCLFJARFILE)$(PATH_SEP)$(LDAPJARFILE)$(PATH_SEP)$(MCCJARFILE)$(PATH_SEP)$(JAVASSLJARFILE)$(PATH_SEP)$(BASEJARFILE)
18 years
[Fedora-directory-commits] adminserver Makefile, 1.18, 1.19 buildpaths.mk, 1.8, 1.9 components.mk, 1.42, 1.43 internal_buildpaths.mk, 1.4, 1.5 nsconfig.mk, 1.26, 1.27
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4776
Modified Files:
Makefile buildpaths.mk components.mk internal_buildpaths.mk
nsconfig.mk
Log Message:
[186105] Admin Server Makefile updates for Internal build
. stopped pulling and packaging DBM
. removed internal/external switch for AdminUtil and SetupUtil
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile 21 Mar 2006 18:33:37 -0000 1.18
+++ Makefile 21 Mar 2006 19:48:49 -0000 1.19
@@ -77,7 +77,7 @@
if test ! -d $(NSPLATFORM_DIR); then mkdir $(NSPLATFORM_DIR); fi;
$(PERL5) buildnum.pl -p $(NSPLATFORM_DIR)
-nsCommon: start_time $(LIBNSPR) $(LIBSECURITY) $(LIBDBM) $(LIBLDAP) $(LIBADMINUTIL) $(LIBICU) $(SETUPUTIL) $(MOD_ADMSERV) $(MOD_RESTARTD) $(MOD_NSS) $(ADMDOC) end_time
+nsCommon: start_time $(LIBNSPR) $(LIBSECURITY) $(LIBLDAP) $(LIBADMINUTIL) $(LIBICU) $(SETUPUTIL) $(MOD_ADMSERV) $(MOD_RESTARTD) $(MOD_NSS) $(ADMDOC) end_time
#
# Notice that BUILD_MODULE is not supplied directly on this target.
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- buildpaths.mk 21 Mar 2006 18:33:37 -0000 1.8
+++ buildpaths.mk 21 Mar 2006 19:48:49 -0000 1.9
@@ -70,23 +70,16 @@
endif
NSPR_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-#NSPR_BUILD_DIR = $(BUILD_ROOT)/../nspr-4.4.1
-
-DBM_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-#DBM_BUILD_DIR = $(BUILD_ROOT)/../nss-3.9.3
SECURITY_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-#SECURITY_BUILD_DIR = $(BUILD_ROOT)/../nss-3.9.3
LDAPSDK_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-#LDAP_ROOT = $(BUILD_ROOT)/../ldapsdk-5.16
MOD_ADMSERV_SOURCE_ROOT = $(BUILD_ROOT)/../mod_admserv
MOD_RESTARTD_SOURCE_ROOT = $(BUILD_ROOT)/../mod_restartd
MOD_NSS_SOURCE_ROOT = $(BUILD_ROOT)/../mod_nss
ICU_SOURCE_ROOT = $(BUILD_ROOT)/../icu
-#ICU_BUILD_DIR = $(BUILD_ROOT)/../icu-2.4
ADMINUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../adminutil
#ADMINUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/adminutil
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- components.mk 21 Mar 2006 18:33:37 -0000 1.42
+++ components.mk 21 Mar 2006 19:48:49 -0000 1.43
@@ -80,31 +80,6 @@
else # INTERNAL_BUILD
@if [ ! -f $@ ]; then echo $@ does not exist - please build or download it ; exit 1 ; fi
endif
-###############################################
-# DBM Library
-##############################################
-
-DBM_RELDATE = DBM_1_61_RTM
-
-ifeq ($(INT_DBM), 1)
-BASE_DBM = $(INT_DIR)/dbm/$(DBM_RELDATE)
-else
-BASE_DBM = $(COMPONENTS_DIR)/dbm/$(DBM_RELDATE)
-endif
-
-$(LIBDBM):
-ifdef INTERNAL_BUILD
-ifneq ($(ARCH), WINNT)
- $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(COMPONENT_PULL_METHOD) -objdir $(NSCP_DISTDIR)/dbm -componentdir $(BASE_DBM) -files xpheader.jar -unzip $(NSCP_DISTDIR)/include
- $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(COMPONENT_PULL_METHOD) -objdir $(NSCP_DISTDIR)/dbm -componentdir $(BASE_DBM)/$(NSOBJDIR_NAME) -files mdbinary.jar -unzip $(NSCP_DISTDIR)
-else
- $(PERL5) $(RELTOOLS)/ftp_puller.pl -method FTP -objdir $(NSCP_DISTDIR)/dbm -componentdir $(BASE_DBM) -files xpheader.jar -unzip $(NSCP_DISTDIR)/include
- $(PERL5) $(RELTOOLS)/ftp_puller.pl -method FTP -objdir $(NSCP_DISTDIR)/dbm -componentdir $(BASE_DBM)/$(NSOBJDIR_NAME) -files mdbinary.jar -unzip $(NSCP_DISTDIR)
-endif
-else # INTERNAL_BUILD
- @if [ ! -f $@ ]; then echo $@ does not exist - please build or download it ; exit 1 ; fi
-endif
-
################################################
# SECURITY LIBRARY
@@ -170,7 +145,6 @@
SETUPUTIL_OBJDIR = $(NSOBJDIR_NAME)
-ifeq ($(BUILD_MODE), int)
ifeq ($(INT_SETUPUTIL), 1)
#intenal & integration
BASE_SETUPUTIL = $(INT_DIR)/$(SETUPUTIL_COMPNAME)/$(SETUPUTIL_RELDATE)/$(SETUPUTIL_OBJDIR)
@@ -178,10 +152,6 @@
#intenal & components
BASE_SETUPUTIL = $(COMPONENTS_DIR)/$(SETUPUTIL_COMPNAME)/$(SETUPUTIL_RELDATE)/$(SETUPUTIL_OBJDIR)
endif
-else
-#fedora
- BASE_SETUPUTIL = $(FED_COMPONENTS_DIR)/$(SETUPUTIL_COMPNAME)/$(SETUPUTIL_RELDATE)/$(SETUPUTIL_OBJDIR)
-endif
SETUPUTIL_DEST = $(SETUPUTIL_ROOT)/$(SETUPUTIL_OBJDIR)
@@ -208,7 +178,6 @@
ADMINUTILOBJDIR = $(NSOBJDIR_NAME)
-ifeq ($(BUILD_MODE), int)
ifeq ($(INT_ADMINUTIL), 1)
#intenal & integration
BASE_ADMINUTIL = $(INT_DIR)/$(ADMINUTIL_COMPNAME)/$(ADMINUTIL_VERSION)/$(ADMINUTILOBJDIR)
@@ -216,11 +185,6 @@
#intenal & components
BASE_ADMINUTIL = $(COMPONENTS_DIR)/$(ADMINUTIL_COMPNAME)/$(ADMINUTIL_VERSION)/$(ADMINUTILOBJDIR)
endif
-else
-#fedora
- BASE_ADMINUTIL = $(FED_COMPONENTS_DIR)/$(ADMINUTIL_COMPNAME)/$(ADMINUTIL_VERSION)/$(ADMINUTILOBJDIR)
-endif
-
$(LIBADMINUTIL):
ifdef INTERNAL_BUILD
Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/internal_buildpaths.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- internal_buildpaths.mk 21 Mar 2006 18:33:37 -0000 1.4
+++ internal_buildpaths.mk 21 Mar 2006 19:48:49 -0000 1.5
@@ -61,11 +61,6 @@
NSPR_BUILD_DIR = $(NSCP_DISTDIR)
endif # NSPR_SOURCE_ROOT
-#DBM_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
-ifndef DBM_SOURCE_ROOT
-DBM_BUILD_DIR = $(NSCP_DISTDIR)
-endif # DBM_SOURCE_ROOT
-
#SECURITY_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
ifndef SECURITY_SOURCE_ROOT
SECURITY_BUILD_DIR = $(NSCP_DISTDIR)
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- nsconfig.mk 21 Mar 2006 18:33:37 -0000 1.26
+++ nsconfig.mk 21 Mar 2006 19:48:49 -0000 1.27
@@ -541,7 +541,6 @@
# AS INCLUDE DEFDINED HERE
MCC_INCLUDE=-I$(NSROOT)/include \
-I$(NSCP_DISTDIR)/include \
- -I$(DBM_INCLUDE) \
-I$(NSPR_INCLUDE) \
-I$(SECURITY_INCLUDE) \
-I$(ICU_INCLUDE) \
@@ -682,29 +681,6 @@
NSPRLINK = -L$(NSPR_LIBPATH) $(addprefix -l, $(NSPR_LIBNAMES))
endif
-##############################
-# DBM
-#############################
-
-ifdef NSPR_SOURCE_ROOT
- DBM_LIBPATH = $(DBM_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
- DBM_INCLUDE = $(DBM_SOURCE_ROOT)/dist/public/dbm
-else
- DBM_LIBPATH = $(DBM_BUILD_DIR)/lib
- DBM_INCLUDE = $(DBM_BUILD_DIR)/include
-endif
-ifeq ($(ARCH), WINNT)
-DBM_LIBNAMES = dbm
-DBMOBJNAME = $(addsuffix .lib, $(DBM_LIBNAMES))
-LIBDBM = $(addprefix $(DBM_LIBPATH)/, $(DBMOBJNAME))
-else
-DBM_LIBNAMES = dbm
-DBM_SOLIBS = $(addsuffix .$(DLL_SUFFIX), $(addprefix lib, $(DBM_LIBNAMES)))
-DBMROBJNAME = $(addsuffix .a, $(addprefix lib, $(DBM_LIBNAMES)))
-LIBDBM = $(addprefix $(DBM_LIBPATH)/, $(DBMROBJNAME))
-DBMLINK = -L$(DBM_LIBPATH) $(addprefix -l, $(DBM_LIBNAMES))
-endif
-
#############################
# NSS
############################
18 years
[Fedora-directory-commits] adminserver/include version.h,1.6,1.7
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2140/include
Modified Files:
version.h
Log Message:
[Bug 186105] Admin Server Makefile updates for Internal build
. get mod_admserv, mod_restartd and mod_nss from /s/b/c (verification, for now)
. updated component versions
NSPR v4.6, NSS 3.11, JSS 3.7, LDAP C SDK v5.17, ICU 3.4,
SetupUtil 1.0 20060307, Console 1.0 20060320, AdminUtil 1.0 20060307
Index: version.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/version.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- version.h 28 Oct 2005 22:44:56 -0000 1.6
+++ version.h 21 Mar 2006 18:34:10 -0000 1.7
@@ -43,4 +43,4 @@
#define ADMSERV_NAME Fedora Administration Server
#define VI_COMPANYNAME "Fedora Project\0"
-#define VI_COPYRIGHT "Copyright (C) 2005 Fedora Project\0"
+#define VI_COPYRIGHT "Copyright (C) 2006 Fedora Project\0"
18 years
[Fedora-directory-commits] adminserver/admserv/newinst/src Makefile, 1.8, 1.9
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2140/admserv/newinst/src
Modified Files:
Makefile
Log Message:
[Bug 186105] Admin Server Makefile updates for Internal build
. get mod_admserv, mod_restartd and mod_nss from /s/b/c (verification, for now)
. updated component versions
NSPR v4.6, NSS 3.11, JSS 3.7, LDAP C SDK v5.17, ICU 3.4,
SetupUtil 1.0 20060307, Console 1.0 20060320, AdminUtil 1.0 20060307
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile 1 Feb 2006 23:04:41 -0000 1.8
+++ Makefile 21 Mar 2006 18:34:05 -0000 1.9
@@ -95,8 +95,12 @@
EXTRA_LIBS+= -ld4r
else
ifeq ($(NSOS_RELEASE), B.11.11)
- CURSES=-lHcurses
- EXTRA_LIBS+= -ld4r
+ ifeq ($(USE_64), 1)
+ CURSES=-lcurses
+ else
+ CURSES=-lHcurses
+ EXTRA_LIBS+= -ld4r
+ endif
else
CURSES=-lcurses
endif
18 years
[Fedora-directory-commits] adminserver/admserv/newinst/insadm insadm.rc, 1.3, 1.4
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/newinst/insadm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2140/admserv/newinst/insadm
Modified Files:
insadm.rc
Log Message:
[Bug 186105] Admin Server Makefile updates for Internal build
. get mod_admserv, mod_restartd and mod_nss from /s/b/c (verification, for now)
. updated component versions
NSPR v4.6, NSS 3.11, JSS 3.7, LDAP C SDK v5.17, ICU 3.4,
SetupUtil 1.0 20060307, Console 1.0 20060320, AdminUtil 1.0 20060307
Index: insadm.rc
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/insadm/insadm.rc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- insadm.rc 2 Mar 2005 23:31:31 -0000 1.3
+++ insadm.rc 21 Mar 2006 18:33:59 -0000 1.4
@@ -48,7 +48,7 @@
VALUE "FileDescription", "Administration Server Installation Plug-in\0"
VALUE "FileVersion", "\0"
VALUE "InternalName", "INSADM\0"
- VALUE "LegalCopyright", "Copyright (C) 2005 Fedora Project\0"
+ VALUE "LegalCopyright", "Copyright (C) 2006 Fedora Project\0"
VALUE "OriginalFilename", "INSADM.DLL\0"
VALUE "ProductName", "Fedora Server Administration Setup\0"
VALUE "ProductVersion", "1, 0, 0, 1\0"
18 years
[Fedora-directory-commits] adminserver/admserv/console build.properties, 1.10, 1.11
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2140/admserv/console
Modified Files:
build.properties
Log Message:
[Bug 186105] Admin Server Makefile updates for Internal build
. get mod_admserv, mod_restartd and mod_nss from /s/b/c (verification, for now)
. updated component versions
NSPR v4.6, NSS 3.11, JSS 3.7, LDAP C SDK v5.17, ICU 3.4,
SetupUtil 1.0 20060307, Console 1.0 20060320, AdminUtil 1.0 20060307
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/build.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.properties 13 Feb 2006 22:13:06 -0000 1.10
+++ build.properties 21 Mar 2006 18:33:54 -0000 1.11
@@ -22,14 +22,15 @@
adminconsole.root=../..
mcc.version=1.0
-mcc.nodot.version=10
admin.core=admserv
-admin.console=${admin.core}${mcc.nodot.version}
+admin.brand=fedora
+
+admin.console=${admin.brand}-${admin.core}-${mcc.version}
console.root=${adminconsole.root}/../built/release/package/java
ldapjdk.jar=${adminconsole.root}/../imports/ldapjdk/ldapjdk.jar
-base.jar=${console.root}/fedora-base-${mcc.version}.jar
+base.jar=${console.root}/${admin.brand}-base-${mcc.version}.jar
caplugin.jar=${console.root}/caplugin/default.jar
-mcc.core=${console.root}/fedora-mcc-${mcc.version}
-nmclf.core=${console.root}/fedora-nmclf-${mcc.version}
+mcc.core=${console.root}/${admin.brand}-mcc-${mcc.version}
+nmclf.core=${console.root}/${admin.brand}-nmclf-${mcc.version}
18 years
[Fedora-directory-commits] adminserver/admserv/cgi-src40 Makefile, 1.8, 1.9
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2140/admserv/cgi-src40
Modified Files:
Makefile
Log Message:
[Bug 186105] Admin Server Makefile updates for Internal build
. get mod_admserv, mod_restartd and mod_nss from /s/b/c (verification, for now)
. updated component versions
NSPR v4.6, NSS 3.11, JSS 3.7, LDAP C SDK v5.17, ICU 3.4,
SetupUtil 1.0 20060307, Console 1.0 20060320, AdminUtil 1.0 20060307
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile 1 Feb 2006 23:03:57 -0000 1.8
+++ Makefile 21 Mar 2006 18:33:48 -0000 1.9
@@ -388,7 +388,7 @@
$(BINDIR)/security: security.c
cd $(BINDIR); \
$(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o $(BINDIR)/security \
- $(SRCDIR)/security.c -L$(NSCP_DISTDIR)/lib \
+ $(SRCDIR)/security.c \
$(ADMINSERVERLINKS)
$(BINDIR)/sec-activate: sec-activate.c
18 years
[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.42, 1.43
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2140/admserv
Modified Files:
pkgadmin.mk
Log Message:
[Bug 186105] Admin Server Makefile updates for Internal build
. get mod_admserv, mod_restartd and mod_nss from /s/b/c (verification, for now)
. updated component versions
NSPR v4.6, NSS 3.11, JSS 3.7, LDAP C SDK v5.17, ICU 3.4,
SetupUtil 1.0 20060307, Console 1.0 20060320, AdminUtil 1.0 20060307
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- pkgadmin.mk 1 Mar 2006 15:19:00 -0000 1.42
+++ pkgadmin.mk 21 Mar 2006 18:33:43 -0000 1.43
@@ -124,20 +124,6 @@
# enable apache module packaging by default - apl is compatible with the gpl
# in this specific instance
PKG_APACHE_MODULES = 1
-ifdef PKG_APACHE_MODULES
-ifndef MOD_ADMSERV_LIB_DIR
- MOD_ADMSERV_LIB_DIR=$(BUILD_ROOT)/../mod_admserv/.libs
-endif
-ifndef MOD_RESTARTD_LIB_DIR
- MOD_RESTARTD_LIB_DIR=$(BUILD_ROOT)/../mod_restartd/.libs
-endif
-ifndef MOD_NSS_LIB_DIR
- MOD_NSS_LIB_DIR=$(BUILD_ROOT)/../mod_nss/.libs
-endif
-ifndef MOD_NSS_BIN_DIR
- MOD_NSS_BIN_DIR=$(BUILD_ROOT)/../mod_nss
-endif
-endif
ifndef NOJAVA
ALLTARGETS = pkguxClient
@@ -168,7 +154,7 @@
# grab the jar files
cd $(ADMIN_JARS) ; \
- cp -p admserv$(ADM_SUF).jar admserv$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars
+ cp -p fedora-admserv-$(ADM_SUF).jar fedora-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars
#
# Cleanup before making distributable zip
@@ -342,10 +328,10 @@
# The Apache modules, if present
ifdef PKG_APACHE_MODULES
- cp $(MOD_ADMSERV_LIB_DIR)/libmodadmserv.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
- cp $(MOD_RESTARTD_LIB_DIR)/libmodrestartd.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
- cp $(MOD_NSS_LIB_DIR)/libmodnss.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
- cp $(MOD_NSS_BIN_DIR)/nss_pcache $(ADMIN_DIR)/bin/admin/admin/bin
+ cp $(MOD_ADMSERV_LIBPATH)/libmodadmserv.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
+ cp $(MOD_RESTARTD_LIBPATH)/libmodrestartd.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
+ cp $(MOD_NSS_LIBPATH)/libmodnss.$(DLL_SUFFIX) $(ADMIN_DIR)/bin/admin/lib
+ cp $(MOD_NSS_BINPATH)/nss_pcache $(ADMIN_DIR)/bin/admin/admin/bin
endif
#
@@ -387,7 +373,7 @@
cp -p $(SETUPUTIL_BIN)/setup.inf $(PKGTOP)
-if [ -z "`egrep "\[admin\]" $(SETUPUTIL_BIN)/setup.inf`" ]; then \
components=`grep "^Components.*=" $(SETUPUTIL_BIN)/setup.inf`; \
- if [ `expr "$$components" : ".*admin"` -eq 0 ]; then \
+ if [ `expr "$$components" : ".*admin"` -eq 0 ]; then \
cat $(SETUPUTIL_BIN)/setup.inf | sed -e "s/^Components.*=.*/&, admin/" > $(PKGTOP)/setup.inf; \
fi; \
echo "" >> $(PKGTOP)/setup.inf; \
18 years