Print this page
4719 update gate build environment to [open]jdk7 4742 update manifests for javadoc7 4743 Fix deprecated /usr/j2se usage in slp and remove from filesystem(5) manpage 4744 remove traces of /var/sadm/system/admin/default_java Reviewed by: Dan McDonald <danmcd@omniti.com> Reviewed by: Richard Lowe <richlowe@richlowe.net>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/lib/libslp/javalib/Makefile.conf
+++ new/usr/src/lib/libslp/javalib/Makefile.conf
1 1 #
2 2 # CDDL HEADER START
3 3 #
4 4 # The contents of this file are subject to the terms of the
5 5 # Common Development and Distribution License (the "License").
6 6 # You may not use this file except in compliance with the License.
7 7 #
8 8 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 # or http://www.opensolaris.org/os/licensing.
10 10 # See the License for the specific language governing permissions
11 11 # and limitations under the License.
12 12 #
13 13 # When distributing Covered Code, include this CDDL HEADER in each
14 14 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 # If applicable, add the following below this CDDL HEADER, with the
16 16 # fields enclosed by brackets "[]" replaced with your own identifying
17 17 # information: Portions Copyright [yyyy] [name of copyright owner]
18 18 #
19 19 # CDDL HEADER END
20 20 #
21 21 #
22 22 # Copyright 2009 Sun Microsystems, Inc. All rights reserved.
23 23 # Use is subject to license terms.
24 24 #
25 25 # Makefile configuration for SLP.
26 26
27 27 # The SLP Java package
28 28
29 29 PKGPATH=com/sun/slp
30 30 PKGNAME=com.sun.slp
31 31
32 32 # The SLP directories.
33 33
34 34 SLPDIR=$(SRC)/lib/libslp
35 35 DOC=$(SLPDIR)/javadoc
36 36 CLASSES=$(SLPDIR)/classes
37 37 SLPJAVASRC=$(SLPDIR)/javalib
38 38
39 39 # SLP jar file, its ultimate destination, and packaging details
40 40 SLPJAR=slp.jar
41 41 SLPDJAR=slpd.jar
42 42 JARDESTDIR=$(ROOT)/usr/share/lib/slp
43 43 INSJARS=$(JARDESTDIR)/$(SLPJAR) $(JARDESTDIR)/$(SLPDJAR)
44 44
45 45 $(JARDESTDIR)/%: $(CLASSES)/%
46 46 $(INS.file)
47 47
|
↓ open down ↓ |
47 lines elided |
↑ open up ↑ |
48 48 # Manifest files
49 49 SLPMANI= $(CLASSES)/manifest.slp
50 50 SLPDMANI= $(CLASSES)/manifest.slpd
51 51
52 52 MANIFESTS= $(SLPMANI) $(SLPDMANI)
53 53
54 54 # Controlled CLASSPATH for making
55 55 SLPCLASSPATH=$(CLASSES):$(SLPJAVASRC)
56 56
57 57 # javac flags
58 -JFLAGS= -O -d $(CLASSES) -sourcepath $(SLPCLASSPATH) -deprecation
58 +JFLAGS= -O -d $(CLASSES) -sourcepath $(SLPCLASSPATH)
59 +JFLAGS += -source 1.6 -target 1.6 -Xlint:deprecation,-options
59 60
60 61 # The default make rule for Java files
61 62 COMPILE.java=$(JAVAC) $(JFLAGS)
62 63
63 64 $(CLASSES)/$(PKGPATH)/%.class: $(SLPJAVASRC)/$(PKGPATH)/%.java
64 65 $(COMPILE.java) $<
65 66
66 67 # Where to put the message files
67 68 MSGDIR = $(ROOT)/usr/share/lib/locale/$(PKGPATH)
68 69 MSGDIRS = $(ROOT)/usr/share/lib/locale \
69 70 $(ROOT)/usr/share/lib/locale/com \
70 71 $(ROOT)/usr/share/lib/locale/com/sun \
71 72 $(MSGDIR)
72 73 CLIENT_MSGS=ClientLib_en.properties
73 74 SERVER_MSGS=Server_en.properties
74 75 MSGFILES=$(MSGDIR)/$(CLIENT_MSGS) $(MSGDIR)/$(SERVER_MSGS)
75 76
76 77 $(JARDESTDIR)/$(SLPDJAR) := FILEMODE = 600
77 78
78 79
79 80 # All SLP classes, not including internal classes (since these are
80 81 # generated and packaged automatically buy this Makefile). Since
81 82 # we take advantage of -Xdepend, the strategy is to place trigger
82 83 # classes at the beginning of the list; these will trigger javac to
83 84 # compile all other classes.
84 85 SLP_CLASSES=\
85 86 UARequester.class SARequester.class slpd.class \
86 87 SunServerDATable.class AttributeVerifier.class \
87 88 SunDATable.class SLPHeaderV2.class SLPServerHeaderV2.class \
88 89 SLPHeaderV1.class SLPV1Manager.class Syslog.class \
89 90 StderrLog.class SLPDgui.class \
90 91 ServiceLocationException.class ServiceLocationEnumeration.class \
91 92 ServiceLocationEnumerator.class Assert.class \
92 93 ServiceType.class ServiceURL.class \
93 94 ServiceLocationAttribute.class ServerAttribute.class \
94 95 AttributeString.class AttributePattern.class \
95 96 Opaque.class AuthBlock.class \
96 97 Defaults.class SLPConfig.class \
97 98 SrvLocMsg.class SrvLocHeader.class\
98 99 SrvLocMsgImpl.class CAttrMsg.class \
99 100 SAttrMsg.class CDAAdvert.class \
100 101 SDAAdvert.class CSAAdvert.class \
101 102 SSAAdvert.class CSrvMsg.class \
102 103 SSrvMsg.class CSrvTypeMsg.class \
103 104 SSrvTypeMsg.class CSrvReg.class \
104 105 SSrvReg.class CSrvDereg.class \
105 106 SSrvDereg.class DATable.class \
106 107 ServiceStore.class ServiceStoreFactory.class \
107 108 ServiceTable.class ServiceStoreInMemory.class \
108 109 Advertiser.class Locator.class \
109 110 ServiceLocationManager.class PermSARegTable.class \
110 111 DAAdvertiser.class ServerDATable.class \
111 112 Listener.class StreamListener.class \
112 113 RequestHandler.class Transact.class \
113 114 SLPV1SAttrMsg.class SLPV1SDAAdvert.class \
114 115 SLPV1SSrvDereg.class SLPV1SSrvMsg.class \
115 116 SLPV1SSrvReg.class SLPV1SSrvTypeMsg.class \
116 117 ServiceLocationAttributeV1.class ServiceURLV1.class \
117 118 SLPTemplateRegistry.class ActiveDiscoverer.class \
118 119 AttributeDescriptor.class ClientMsgManager.class \
119 120 IANACharCode.class Parser.class \
120 121 ServiceLocationAttributeVerifier.class SLPV1CDAAdvert.class \
121 122 URLAttributeVerifier.class TemplateRegistry.class \
122 123 ServiceLocationAttributeDescriptor.class \
123 124 SLPTokenizer.class
124 125
125 126 # This is a hand-crafted subset of classes that are needed for slp.jar.
126 127 # We take the extra effort here so that customers don't need to pull
127 128 # in slpd.jar, which is more than double the size of slp.jar, when
128 129 # they will only need these classes.
129 130 UA_SA_SUBSET_CLASSES_ORIG=\
130 131 Advertiser.class Assert.class AttributeString.class \
131 132 AuthBlock.class CAttrMsg.class CDAAdvert.class \
132 133 CSAAdvert.class CSrvDereg.class CSrvMsg.class \
133 134 CSrvReg.class CSrvTypeMsg.class DATable\$$DARecord.class \
134 135 SLPHeaderV2.class SrvLocHeader.class SrvLocMsgImpl.class \
135 136 DATable.class Defaults.class \
136 137 Locator.class Opaque.class PermSARegTable.class \
137 138 SARequester.class SLPConfig.class Syslog.class \
138 139 ServiceURL.class SrvLocMsg.class Transact.class \
139 140 ServerAttribute.class ServiceLocationAttribute.class \
140 141 ServiceLocationEnumeration.class ServiceLocationEnumerator.class \
141 142 ServiceLocationException.class ServiceType.class \
142 143 UARequester.class ServiceLocationManager.class \
143 144 SunDATable.class TemplateRegistry.class SLPTemplateRegistry.class \
144 145 ServiceLocationAttributeVerifier.class AttributeVerifier.class \
145 146 ServiceLocationAttributeDescriptor.class AttributeDescriptor.class \
146 147 URLAttributeVerifier.class StderrLog.class \
147 148 StderrLog.class SLPConfig\$$SLPProperties.class \
148 149 SLPHeaderV2\$$OptionParser.class SLPHeaderV2\$$SLPOption.class \
149 150 SLPTokenizer.class
150 151
151 152 ALL_SLP_CLASSES=${SLP_CLASSES:%=$(CLASSES)/$(PKGPATH)/%}
152 153 UA_SA_SUBSET_CLASSES=${UA_SA_SUBSET_CLASSES_ORIG:%=$(PKGPATH)/%}
|
↓ open down ↓ |
84 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX