This commit is contained in:
christophe.ravel.bugs%sun.com 2004-10-06 21:49:45 +00:00
Родитель d45e76dd69
Коммит 0c439940ef
2 изменённых файлов: 14 добавлений и 8 удалений

Просмотреть файл

@ -2,7 +2,7 @@
# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#ident "$Id: Makefile,v 1.7 2004/08/23 21:09:12 christophe.ravel.bugs%sun.com Exp $"
#ident "$Id: Makefile,v 1.8 2004/10/06 21:49:45 christophe.ravel.bugs%sun.com Exp $"
#
CORE_DEPTH = ../../..
@ -28,13 +28,13 @@ ifdef JSS3_LOCATION
endif
mkdir -p opt/sun/private/share/lib
ifeq ($(BUILD_OPT), 1)
cp $(CORE_DEPTH)/../dist/release/no-policy/classes/xpclass.jar \
cp $(CORE_DEPTH)/../dist/release/no-policy/classes/jss4.jar \
opt/sun/private/share/lib/jss4.jar
ifdef JSS3_LOCATION
cp $(JSS3_LOCATION)/xpclass.jar opt/sun/private/share/lib/jss3.jar
endif
else
cp $(CORE_DEPTH)/../dist/release/no-policy/classes_DBG/xpclass_dbg.jar \
cp $(CORE_DEPTH)/../dist/release/no-policy/classes_DBG/jss4_dbg.jar \
opt/sun/private/share/lib/jss4.jar
ifdef JSS3_LOCATION
cp $(JSS3_LOCATION)/xpclass_dbg.jar opt/sun/private/share/lib/jss3.jar

Просмотреть файл

@ -2,7 +2,7 @@
# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#ident "$Id: Makefile,v 1.9 2004/07/22 17:52:04 christophe.ravel.bugs%sun.com Exp $"
#ident "$Id: Makefile,v 1.10 2004/10/06 21:49:45 christophe.ravel.bugs%sun.com Exp $"
#
CORE_DEPTH = ../../..
@ -32,6 +32,12 @@ DIST64 = $(shell echo $(DIST) | sed -e "s|_OPT|_64_OPT|g" -e "s|_DBG|_64_DBG|g")
OBJ32 = $(shell basename $(DIST))
OBJ64 = $(shell basename $(DIST64))
ifeq ($(BUILD_OPT),1)
IMPORT_JSS_JAR = jss4.jar
else
IMPORT_JSS_JAR = jss4_dbg.jar
endif
awk_pkginfo: bld_awk_pkginfo
./bld_awk_pkginfo -m $(MACH) -p "$(PRODUCT_VERSION)" -o $@ -v $(PRODUCT_VERSION)
@ -54,9 +60,9 @@ ifdef JSS3_LOCATION
endif
$(ROOT)/usr/share/lib/mps/sparcv9:
echo "target=$(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_XPCLASS_JAR)"
echo "target=$(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_JSS_JAR)"
mkdir -p $@
$(CP) $(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_XPCLASS_JAR) $@/jss4.jar
$(CP) $(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_JSS_JAR) $@/jss4.jar
ifdef JSS3_LOCATION
$(CP) $(JSS3_LOCATION)/$(IMPORT_XPCLASS_JAR) $@/jss3.jar
endif
@ -69,9 +75,9 @@ ifdef JSS3_LOCATION
endif
$(ROOT)/usr/share/lib/mps:
echo "target=$(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_XPCLASS_JAR)"
echo "target=$(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_JSS_JAR)"
mkdir -p $@
$(CP) $(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_XPCLASS_JAR) $@/jss4.jar
$(CP) $(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_JSS_JAR) $@/jss4.jar
ifdef JSS3_LOCATION
$(CP) $(JSS3_LOCATION)/$(IMPORT_XPCLASS_JAR) $@/jss3.jar
endif