[Fedora-directory-commits] adminserver/admserv/console javarules.mk, 1.5, 1.6
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)