[Fedora-directory-commits] ldapserver/ldap javarules.mk,1.6,1.7

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26597/ldap

Modified Files:
	javarules.mk 
Log Message:
[186642] Directory Server Makefile updates for Internal build (Comment #6)
1) picked up the latest components including Cyrus SASL, Perldap, SetupUtil,
and AdminServer 
2) fixed the java paths for the internal build.
3) added an option -AA to HP-UX C++ compiler to adjust to SetupUtil build (use
libstd 2)
4) replaced <iostream.h>, <strstream.h> and <fstream.h> with <iostream>,
<strstream>, <fstream> respectively in ldap/cm/newinst/ux-dialog.cc 
5) package svrcore and perldap, which were dropped in the current
ldap/cm/Makefile
6) added a perl script genPerlDAPInf.pl to generate perldap.inf file



Index: javarules.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/javarules.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- javarules.mk	3 Oct 2005 19:53:46 -0000	1.6
+++ javarules.mk	7 Apr 2006 01:33:30 -0000	1.7
@@ -68,54 +68,34 @@
 
 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
-ifdef GET_JAVA_FROM_PATH
+ifeq ($(INTERNAL_BUILD), 1)
+  # For UNIX, use JDK and JAR files over NFS
+  ifeq ($(ARCH), Linux)
+    JDK_VERSION:=1.4.2_SR3
+    JDK_VERSDIR:=ibmjdk/$(JDK_VERSION)/$(NSOBJDIR_NAME)
+  else
+    ifeq ($(ARCH), HPUX)
+      JDK_VERSION:=1.4.2_09
+      JDK_VERSDIR:=hpjdk/$(JDK_VERSION)
+    else
+      JDK_VERSION:=1.4.2_10 # Solaris
+      JDK_VERSDIR:=jdk/$(JDK_VERSION)/$(NSOBJDIR_NAME)
+    endif
+  endif	
+  JDKLIB:=$(COMPONENTS_DIR)/$(JDK_VERSDIR)/lib/tools.jar
+  JAVABINDIR:=$(COMPONENTS_DIR)/$(JDK_VERSDIR)/bin
+else # INTERNAL_BUILD
   # Figure out where the java lib .jar files are, from where javac is
   JDKCOMP := $(shell which javac)
   JDKPRELIB := $(subst bin/javac$(EXE_SUFFIX),lib,$(JDKCOMP))
   JDKLIB := $(addprefix $(JDKPRELIB)/,tools.jar)
-else
-
-# 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
-  else
-	ifeq ($(ARCH), HPUX)
-		JDK_VERSION=1.4.1_05
-	else
-  		JDK_VERSION=1.4.0_01
-	endif
-  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
-
 CLASSPATH := $(JAVA_SRC_DIR)$(PATH_SEP)$(LDAPJARFILE)
 
 ifndef JAVA