From 005096279bb195a2ca2b0f5a29e7a56f7d1832a2 Mon Sep 17 00:00:00 2001 From: cvs2hg Date: Fri, 9 May 2003 18:19:40 +0000 Subject: fixup commit for tag 'SUN_SECURITY_3_3_5_BETA3' --- security/coreconf/.cshrc | 273 ------------------------------------------ security/coreconf/.profile | 216 --------------------------------- security/coreconf/AIX5.1.mk | 1 + security/coreconf/jdk.mk | 33 +++-- security/coreconf/jniregen.pl | 3 +- security/coreconf/rules.mk | 35 ++++-- security/coreconf/source.mk | 49 ++++---- 7 files changed, 77 insertions(+), 533 deletions(-) delete mode 100644 security/coreconf/.cshrc delete mode 100644 security/coreconf/.profile diff --git a/security/coreconf/.cshrc b/security/coreconf/.cshrc deleted file mode 100644 index 659e4f7aa..000000000 --- a/security/coreconf/.cshrc +++ /dev/null @@ -1,273 +0,0 @@ -#!/bin/csh -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# -# Startup file for csh and tcsh. It is meant to work on: -# -# SunOS 4.1.3_U1, -# Sun Solaris, -# Sun Solaris on Intel, -# SGI IRIX, -# SGI IRIX64, -# UNIX_SV, -# IBM AIX, -# Hewlett-Packard HP-UX, -# SCO_SV, -# FreeBSD, -# DEC OSF/1, -# Linux, -# and everything else. -# - -############################################### -# Set operating system name and release level # -############################################### - -set os_name=`uname -s` -set os_release=`uname -r` - -########################################################## -# Set environment variables based upon operating system # -########################################################## - -if ($os_name == "SunOS" && $os_release == "4.1.3_U1") then - ############################## - # SunOS 4.1.3_U1 - # - - setenv NO_MDUPDATE 1 - - set path = ( /tools/ns/soft/gcc-2.6.3/run/default/sparc_sun_sunos4.1.3_U1/bin \ - /tools/ns/bin \ - /sbin \ - /usr/bin \ - /usr/openwin/bin \ - /usr/openwin/include \ - /usr/ucb \ - /usr/local/bin \ - /etc \ - /usr/etc \ - /usr/etc/install \ - . ) - -else if ($os_name == "SunOS") then - ################################ - # Assume it is Sun Solaris - # - - # To build Navigator on Solaris 2.5, I must set the environment - # variable NO_MDUPDATE and use gcc-2.6.3. - setenv NO_MDUPDATE 1 - - set path = ( /share/builds/components/jdk/1.2.2_01/SunOS \ - /usr/ccs/bin \ - /usr/opt/bin \ - /tools/ns/bin \ - /usr/sbin \ - /sbin \ - /usr/bin \ - /usr/dt/bin \ - /usr/openwin/bin \ - /usr/openwin/include \ - /usr/ucb \ - /usr/opt/java/bin \ - /usr/local/bin \ - /etc \ - /usr/etc \ - /usr/etc/install \ - /opt/Acrobat3/bin \ - . ) - - # To get the native Solaris cc - if (`uname -m` == i86pc) then - set path = ( /h/solx86/export/home/opt/SUNWspro/SC3.0.1/bin \ - $path ) - else - set path = ( /tools/ns/workshop/bin \ - /tools/ns/soft/gcc-2.6.3/run/default/sparc_sun_solaris2.4/bin \ - $path ) - endif - - setenv LD_LIBRARY_PATH /share/builds/components/jdk/1.2.2_01/SunOS/lib/sparc/native_threads - - setenv MANPATH /usr/local/man:/usr/local/lib/mh/man:/usr/local/lib/rcscvs/man:/usr/local/lib/fvwm/man:/usr/local/lib/xscreensaver/man:/usr/share/man:/usr/openwin/man:/usr/opt/man - - # For Purify - setenv PURIFYHOME /usr/local-sparc-solaris/pure/purify-4.0-solaris2 - setenv PATH ${PURIFYHOME}:$PATH - setenv MANPATH $PURIFYHOME/man:$MANPATH - setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:$PURIFYHOME - setenv PURIFYOPTIONS "-max_threads=1000 -follow-child-processes=yes" - -else if ($os_name == "IRIX" || $os_name == "IRIX64") then - ############# - # SGI Irix - # - - set path = ( /share/builds/components/jdk/1.2.1/IRIX \ - /tools/ns/bin \ - /tools/contrib/bin \ - /usr/local/bin \ - /usr/sbin \ - /usr/bsd \ - /usr/bin \ - /bin \ - /etc \ - /usr/etc \ - /usr/bin/X11 \ - . ) - -else if ($os_name == "UNIX_SV") then - ################# - # UNIX_SV - # - - set path = ( /usr/local/bin \ - /tools/ns/bin \ - /bin \ - /usr/bin \ - /usr/bin/X11 \ - /X11/bin \ - /usr/X/bin \ - /usr/ucb \ - /usr/sbin \ - /sbin \ - /usr/ccs/bin \ - . ) - -else if ($os_name == "AIX") then - ################# - # IBM AIX - # - - set path = ( /share/builds/components/jdk/1.2.2/AIX \ - /usr/ucb/ \ - /tools/ns-arch/rs6000_ibm_aix4.1/bin \ - /tools/ns-arch/rs6000_ibm_aix3.2.5/bin \ - /share/tools/ns/soft/cvs-1.8/run/default/rs6000_ibm_aix3.2.5/bin \ - /bin \ - /usr/bin \ - /usr/ccs/bin \ - /usr/sbin \ - /usr/local/bin \ - /usr/bin/X11 \ - /usr/etc \ - /etc \ - /sbin \ - . ) - -else if ($os_name == "HP-UX") then - ################# - # HP UX - # - - set path = ( /share/builds/components/jdk/1.1.6/HP-UX \ - /usr/bin \ - /opt/ansic/bin \ - /usr/ccs/bin \ - /usr/contrib/bin \ - /opt/nettladm/bin \ - /opt/graphics/common/bin \ - /usr/bin/X11 \ - /usr/contrib/bin/X11 \ - /opt/upgrade/bin \ - /opt/CC/bin \ - /opt/aCC/bin \ - /opt/langtools/bin \ - /opt/imake/bin \ - /etc \ - /usr/etc \ - /usr/local/bin \ - /tools/ns/bin \ - /tools/contrib/bin \ - /usr/sbin \ - /usr/local/bin \ - /tools/ns/bin \ - /tools/contrib/bin \ - /usr/sbin \ - /usr/include/X11R5 \ - . ) - -else if ($os_name == "SCO_SV") then - ################# - # SCO - # - - set path = ( /bin \ - /usr/bin \ - /tools/ns/bin \ - /tools/contrib/bin \ - /usr/sco/bin \ - /usr/bin/X11 \ - /usr/local/bin \ - . ) - -else if ($os_name == "FreeBSD") then - ################# - # FreeBSD - # - - setenv PATH /usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin:/usr/local/java/bin:/usr/local/bin:/usr/ucb:/usr/ccs/bin:/tools/contrib/bin:/tools/ns/bin:. - -else if ($os_name == "OSF1") then - ################# - # DEC OSF1 - # - - set path = ( /share/builds/components/jdk/1.2.2_3/OSF1 \ - /tools/ns-arch/alpha_dec_osf4.0/bin \ - /tools/ns-arch/soft/cvs-1.8.3/run/default/alpha_dec_osf2.0/bin \ - /usr/local-alpha-osf/bin \ - /usr3/local/bin \ - /usr/local/bin \ - /usr/sbin \ - /usr/bin \ - /bin \ - /usr/bin/X11 \ - /usr/ucb \ - . ) - -else if ($os_name == "Linux") then - ################# - # Linux - # - - set path = ( /share/builds/components/jdk/1.2.2/Linux \ - $path ) - -endif - -############################### -# Reset any "tracked" aliases # -############################### - -rehash diff --git a/security/coreconf/.profile b/security/coreconf/.profile deleted file mode 100644 index 5474405e2..000000000 --- a/security/coreconf/.profile +++ /dev/null @@ -1,216 +0,0 @@ -#!/bin/sh -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# -# Startup file for sh, ksh and bash. It is meant to work on: -# -# SunOS 4.1.3_U1, -# Sun Solaris, -# Sun Solaris on Intel, -# SGI IRIX, -# SGI IRIX64, -# UNIX_SV, -# IBM AIX, -# Hewlett-Packard HP-UX, -# SCO_SV, -# FreeBSD, -# DEC OSF/1, -# Linux, -# and everything else. -# - -############################################### -# Set operating system name and release level # -############################################### - -OS_NAME=`uname -s` -export OS_NAME - -OS_RELEASE=`uname -r` -export OS_RELEASE - -########################################################## -# Set environment variables based upon operating system # -########################################################## - -case $OS_NAME in - - SunOS) - ############################## - # Sun - # - - case $OS_RELEASE in - - 4.1.3_U1) - ############################## - # SunOS 4.1.3_U1 - # - - NO_MDUPDATE=1 - export NO_MDUPDATE - - PATH=/tools/ns/soft/gcc-2.6.3/run/default/sparc_sun_sunos4.1.3_U1/bin:tools/ns/bin:/sbin:/usr/bin:/usr/openwin/bin:/usr/openwin/include:/usr/ucb:/usr/local/bin:/etc:/usr/etc:/usr/etc/install:. - export PATH - ;; - - *) - ################################ - # Assume it is Sun Solaris - # - - # To build Navigator on Solaris 2.5, I must set the environment - # variable NO_MDUPDATE and use gcc-2.6.3. - NO_MDUPDATE=1 - export NO_MDUPDATE - - PATH=/share/builds/components/jdk/1.2.2_01/SunOS:/usr/ccs/bin:/usr/opt/bin:/tools/ns/bin:/usr/sbin:/sbin:/usr/bin:/usr/dt/bin:/usr/openwin/bin:/usr/openwin/include:/usr/ucb:/usr/opt/java/bin:/usr/local/bin:/etc:/usr/etc:/usr/etc/install:/opt/Acrobat3/bin:. - export PATH - - # To get the native Solaris cc - OS_TEST=`uname -m` - export OS_TEST - - case $OS_TEST in - - i86pc) - PATH=/h/solx86/export/home/opt/SUNWspro/SC3.0.1/bin:$PATH - export PATH - ;; - - *) - PATH=/tools/ns/workshop/bin:/tools/ns/soft/gcc-2.6.3/run/default/sparc_sun_solaris2.4/bin:$PATH - export PATH - ;; - esac - - LD_LIBRARY_PATH=/share/builds/components/jdk/1.2.2_01/SunOS/lib/sparc/native_threads - export LD_LIBRARY_PATH - - MANPATH=/usr/local/man:/usr/local/lib/mh/man:/usr/local/lib/rcscvs/man:/usr/local/lib/fvwm/man:/usr/local/lib/xscreensaver/man:/usr/share/man:/usr/openwin/man:/usr/opt/man - export MANPATH - - # For Purify - PURIFYHOME=/usr/local-sparc-solaris/pure/purify-4.0-solaris2 - export PURIFYHOME - PATH=/usr/local-sparc-solaris/pure/purify-4.0-solaris2:$PATH - export PATH - MANPATH=$PURIFYHOME/man:$MANPATH - export MANPATH - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local-sparc-solaris/pure/purify-4.0-solaris2 - export LD_LIBRARY_PATH - PURIFYOPTIONS="-max_threads=1000 -follow-child-processes=yes" - export PURIFYOPTIONS - ;; - esac - ;; - - IRIX | IRIX64) - ############# - # SGI Irix - # - - PATH=/share/builds/components/jdk/1.2.1/IRIX:/tools/ns/bin:/tools/contrib/bin:/usr/local/bin:/usr/sbin:/usr/bsd:/usr/bin:/bin:/etc:/usr/etc:/usr/bin/X11:. - export PATH - ;; - - UNIX_SV) - ################# - # UNIX_SV - # - - PATH=/usr/local/bin:/tools/ns/bin:/bin:/usr/bin:/usr/bin/X11:/X11/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/sbin:/usr/ccs/bin:. - export PATH - ;; - - AIX) - ################# - # IBM AIX - # - - PATH=/share/builds/components/jdk/1.2.2/AIX:/usr/ucb/:/tools/ns-arch/rs6000_ibm_aix4.1/bin:/tools/ns-arch/rs6000_ibm_aix3.2.5/bin:/share/tools/ns/soft/cvs-1.8/run/default/rs6000_ibm_aix3.2.5/bin:/bin:/usr/bin:/usr/ccs/bin:/usr/sbin:/usr/local/bin:/usr/bin/X11:/usr/etc:/etc:/sbin:. - export PATH - ;; - - HP-UX) - ################# - # HP UX - # - - PATH=/share/builds/components/jdk/1.1.6/HP-UX:/usr/bin:/opt/ansic/bin:/usr/ccs/bin:/usr/contrib/bin:/opt/nettladm/bin:/opt/graphics/common/bin:/usr/bin/X11:/usr/contrib/bin/X11:/opt/upgrade/bin:/opt/CC/bin:/opt/aCC/bin:/opt/langtools/bin:/opt/imake/bin:/etc:/usr/etc:/usr/local/bin:/tools/ns/bin:/tools/contrib/bin:/usr/sbin:/usr/local/bin:/tools/ns/bin:/tools/contrib/bin:/usr/sbin:/usr/include/X11R5:. - export PATH - ;; - - SCO_SV) - ################# - # SCO - # - - PATH=/bin:/usr/bin:/tools/ns/bin:/tools/contrib/bin:/usr/sco/bin:/usr/bin/X11:/usr/local/bin:. - export PATH - ;; - - FreeBSD) - - ################# - # FreeBSD - # - - PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin:/usr/local/java/bin:/usr/local/bin:/usr/ucb:/usr/ccs/bin:/tools/contrib/bin:/tools/ns/bin:. - export PATH - ;; - - OSF1) - ################# - # DEC OSF1 - # - - PATH=/share/builds/components/jdk/1.2.2_3/OSF1:/tools/ns-arch/alpha_dec_osf4.0/bin:/tools/ns-arch/soft/cvs-1.8.3/run/default/alpha_dec_osf2.0/bin:/usr/local-alpha-osf/bin:/usr3/local/bin:/usr/local/bin:/usr/sbin:/usr/bin:/bin:/usr/bin/X11:/usr/ucb:. - export PATH - ;; - - Linux) - - ################# - # Linux - # - - PATH=/share/builds/components/jdk/1.2.2/Linux:$PATH - export PATH - ;; -esac - -############################### -# Reset any "tracked" aliases # -############################### - -hash -r diff --git a/security/coreconf/AIX5.1.mk b/security/coreconf/AIX5.1.mk index 720d115cc..d975638fb 100644 --- a/security/coreconf/AIX5.1.mk +++ b/security/coreconf/AIX5.1.mk @@ -43,6 +43,7 @@ ifeq ($(USE_64), 1) OBJECT_MODE=64 export OBJECT_MODE endif +OS_CFLAGS += -DAIX5_1 DSO_LDOPTS = -brtl -bM:SRE -bnoentry $(EXPORT_RULES) MKSHLIB = $(LD) $(DSO_LDOPTS) -lsvld -L/usr/lpp/xlC/lib -lc -lm diff --git a/security/coreconf/jdk.mk b/security/coreconf/jdk.mk index 9cbfc3dfe..b6a01bff3 100644 --- a/security/coreconf/jdk.mk +++ b/security/coreconf/jdk.mk @@ -139,7 +139,11 @@ ifeq ($(OS_ARCH), SunOS) INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH) # (3) specify "linker" information - JAVA_CPU = sparc +ifeq ($(USE_64), 1) + JAVA_CPU = $(shell uname -p)v9 +else + JAVA_CPU = $(shell uname -p) +endif ifeq ($(JDK_VERSION), 1.1) JAVA_LIBDIR = lib/$(JAVA_CPU) @@ -153,8 +157,13 @@ endif JAVA_CLIBS = -lthread ifneq ($(JDK_VERSION), 1.1) - JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic -ljvm - JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR) -ljava +ifeq ($(USE_64), 1) + JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/server +else + JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic +endif + JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR) + JAVA_LIBS += -ljvm -ljava else JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/$(JDK_THREADING_MODEL) -ljava endif @@ -195,7 +204,11 @@ ifeq ($(OS_ARCH), HP-UX) JAVA_CLIBS = JAVA_LIBS = -L$(JAVA_HOME)/$(JAVA_LIBDIR)/$(JDK_THREADING_MODEL) -lhpi + ifeq ($(JDK_VERSION), 1.4) + JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/server -ljvm + else JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic -ljvm + endif JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR) -ljava JAVA_LIBS += $(JAVA_CLIBS) @@ -234,7 +247,11 @@ ifeq ($(OS_ARCH), Linux) JAVA_CLIBS = JAVA_LIBS = -L$(JAVA_HOME)/$(JAVA_LIBDIR)/$(JDK_THREADING_MODEL) -lhpi - JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic -ljvm + ifeq ($(JDK_VERSION), 1.4) + JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/server -ljvm + else + JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic -ljvm + endif JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR) -ljava JAVA_LIBS += $(JAVA_CLIBS) @@ -395,11 +412,13 @@ ifeq ($(JDK_CLASSPATH_OPT),) JDK_CLASSPATH_OPT = -classpath $(JDK_CLASSPATH) endif +ifeq ($(USE_64), 1) + JDK_USE_64 = -d64 +endif endif -ifdef NS_USE_JDK_TOOLSET ####################################################################### # [5] Define JDK "Core Components" toolset; # # (always allow a user to override these values) # @@ -437,6 +456,7 @@ ifeq ($(JAVA),) JAVA_FLAGS += $(JDK_DEBUG_OPT) JAVA_FLAGS += $(JDK_CLASSPATH_OPT) JAVA_FLAGS += $(JDK_JIT_OPT) + JAVA_FLAGS += $(JDK_USE_64) JAVA = $(JAVA_PROG) $(JAVA_FLAGS) endif @@ -451,6 +471,7 @@ ifeq ($(JAVAC),) JAVAC_FLAGS += $(JDK_DEBUG_OPT) JAVAC_FLAGS += $(JDK_CLASSPATH_OPT) JAVAC_FLAGS += $(JDK_CLASS_REPOSITORY_OPT) + JAVAC_FLAGS += $(JDK_USE_64) JAVAC = $(JAVAC_PROG) $(JAVAC_FLAGS) endif @@ -608,5 +629,3 @@ ifeq ($(SERIALVER),) SERIALVER_FLAGS = $(JDK_THREADING_MODEL_OPT) SERIALVER = $(SERIALVER_PROG) $(SERIALVER_FLAGS) endif - -endif diff --git a/security/coreconf/jniregen.pl b/security/coreconf/jniregen.pl index 05774cff7..8bdd24448 100755 --- a/security/coreconf/jniregen.pl +++ b/security/coreconf/jniregen.pl @@ -99,8 +99,9 @@ foreach $filename (@ARGV) if( @filelist ) { $cmd = "$javah " . join(" ",@filelist); + $cmd =~ s/\'/\"/g; # because windows doesn't understand single quote print "$cmd\n"; - system("$cmd"); + exit (system($cmd) >> 8); } else { print "All JNI header files up to date.\n" } diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index 7126d8fc4..a4ec5c57d 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -242,21 +242,30 @@ endif release_policy:: +$(LOOP_OVER_DIRS) -release_md:: -ifdef LIBRARY - $(INSTALL) -m 444 $(LIBRARY) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR) -endif -ifdef SHARED_LIBRARY - $(INSTALL) -m 555 $(SHARED_LIBRARY) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR) -endif -ifdef IMPORT_LIBRARY - $(INSTALL) -m 555 $(IMPORT_LIBRARY) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR) +ifndef NO_MD_RELEASE + ifdef LIBRARY + MD_LIB_RELEASE_FILES += $(LIBRARY) + endif + ifdef SHARED_LIBRARY + MD_LIB_RELEASE_FILES += $(SHARED_LIBRARY) + endif + ifdef IMPORT_LIBRARY + MD_LIB_RELEASE_FILES += $(IMPORT_LIBRARY) + endif + ifdef PROGRAM + MD_BIN_RELEASE_FILES += $(PROGRAM) + endif + ifdef PROGRAMS + MD_BIN_RELEASE_FILES += $(PROGRAMS) + endif endif -ifdef PROGRAM - $(INSTALL) -m 555 $(PROGRAM) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_BIN_DIR) + +release_md:: +ifneq ($(MD_LIB_RELEASE_FILES),) + $(INSTALL) -m 444 $(MD_LIB_RELEASE_FILES) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR) endif -ifdef PROGRAMS - $(INSTALL) -m 555 $(PROGRAMS) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_BIN_DIR) +ifneq ($(MD_BIN_RELEASE_FILES),) + $(INSTALL) -m 555 $(MD_BIN_RELEASE_FILES) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_BIN_DIR) endif +$(LOOP_OVER_DIRS) diff --git a/security/coreconf/source.mk b/security/coreconf/source.mk index 170d7dc25..165697786 100644 --- a/security/coreconf/source.mk +++ b/security/coreconf/source.mk @@ -40,11 +40,11 @@ # ifndef SOURCE_PREFIX -ifndef BUILD_TREE -SOURCE_PREFIX = $(CORE_DEPTH)/../dist -else -SOURCE_PREFIX = $(BUILD_TREE)/dist -endif + ifndef BUILD_TREE + SOURCE_PREFIX = $(CORE_DEPTH)/../dist + else + SOURCE_PREFIX = $(BUILD_TREE)/dist + endif endif # @@ -52,7 +52,7 @@ endif # ifndef SOURCE_XP_DIR -SOURCE_XP_DIR = $(SOURCE_PREFIX) + SOURCE_XP_DIR = $(SOURCE_PREFIX) endif # @@ -65,9 +65,9 @@ SOURCE_XPHEADERS_DIR = $(SOURCE_XP_DIR)/public/$(MODULE) SOURCE_XPPRIVATE_DIR = $(SOURCE_XP_DIR)/private/$(MODULE) ifdef BUILD_OPT - IMPORT_XPCLASS_DIR = $(SOURCE_CLASSES_DIR) + IMPORT_XPCLASS_DIR = $(SOURCE_CLASSES_DIR) else - IMPORT_XPCLASS_DIR = $(SOURCE_CLASSES_DBG_DIR) + IMPORT_XPCLASS_DIR = $(SOURCE_CLASSES_DBG_DIR) endif # @@ -75,7 +75,7 @@ endif # ifndef SOURCE_MD_DIR -SOURCE_MD_DIR = $(SOURCE_PREFIX)/$(PLATFORM) + SOURCE_MD_DIR = $(SOURCE_PREFIX)/$(PLATFORM) endif # @@ -84,17 +84,17 @@ endif #This is where we install built executables and (for Windows only) DLLs. ifndef SOURCE_BIN_DIR -SOURCE_BIN_DIR = $(SOURCE_MD_DIR)/bin + SOURCE_BIN_DIR = $(SOURCE_MD_DIR)/bin endif #This is where we install built libraries (.a, .so, .lib). ifndef SOURCE_LIB_DIR -SOURCE_LIB_DIR = $(SOURCE_MD_DIR)/lib + SOURCE_LIB_DIR = $(SOURCE_MD_DIR)/lib endif # This is where NSPR header files are found. ifndef SOURCE_MDHEADERS_DIR -SOURCE_MDHEADERS_DIR = $(SOURCE_MD_DIR)/include + SOURCE_MDHEADERS_DIR = $(SOURCE_MD_DIR)/include endif ####################################################################### @@ -108,14 +108,14 @@ endif # ifeq ($(POLICY), domestic) - SOURCE_RELEASE_PREFIX = $(SOURCE_PREFIX)/release/domestic + SOURCE_RELEASE_PREFIX = $(SOURCE_PREFIX)/release/domestic else - ifeq ($(POLICY), export) - SOURCE_RELEASE_PREFIX = $(SOURCE_PREFIX)/release/export + ifeq ($(POLICY), export) + SOURCE_RELEASE_PREFIX = $(SOURCE_PREFIX)/release/export + else + ifeq ($(POLICY), france) + SOURCE_RELEASE_PREFIX = $(SOURCE_PREFIX)/release/france else - ifeq ($(POLICY), france) - SOURCE_RELEASE_PREFIX = $(SOURCE_PREFIX)/release/france - else #We shouldn't have to put another directory under here, but without it the perl #script for releasing doesn't find the directory. It thinks it doesn't exist. #So we're adding this no-policy directory so that the script for releasing works @@ -123,9 +123,9 @@ else #files land, only where they are placed in the local tree when building the jar #files. When there is no policy, the jar files will still land in #/// like they used to. - SOURCE_RELEASE_PREFIX = $(SOURCE_PREFIX)/release/no-policy - endif + SOURCE_RELEASE_PREFIX = $(SOURCE_PREFIX)/release/no-policy endif + endif endif # @@ -151,9 +151,11 @@ XPCLASS_DBG_JAR = xpclass_dbg.jar XPHEADER_JAR = xpheader.jar ifdef BUILD_OPT - IMPORT_XPCLASS_JAR = $(XPCLASS_JAR) + SOURCE_RELEASE_XP_CLASSES_DIR = $(SOURCE_RELEASE_CLASSES_DIR) + IMPORT_XPCLASS_JAR = $(XPCLASS_JAR) else - IMPORT_XPCLASS_JAR = $(XPCLASS_DBG_JAR) + SOURCE_RELEASE_XP_CLASSES_DIR = $(SOURCE_RELEASE_CLASSES_DBG_DIR) + IMPORT_XPCLASS_JAR = $(XPCLASS_DBG_JAR) endif # @@ -182,6 +184,7 @@ MDHEADER_JAR = mdheader.jar # Where to put the results ifneq ($(RESULTS_DIR),) - RESULTS_DIR = $(RELEASE_TREE)/sectools/results + RESULTS_DIR = $(RELEASE_TREE)/sectools/results endif +MK_SOURCE = included -- cgit v1.2.1