Print this page
NEX-3123 update gate build environment to [open]jdk7
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Jean McCormack <jean.mccormack@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
| 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.
|
↓ open down ↓ |
14 lines elided |
↑ open up ↑ |
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 +# Copyright 2014 PALO, Richard. All rights reserved.
26 +#
25 27 # Makefile configuration for SLP.
26 28
27 29 # The SLP Java package
28 30
29 31 PKGPATH=com/sun/slp
30 32 PKGNAME=com.sun.slp
31 33
32 34 # The SLP directories.
33 35
34 36 SLPDIR=$(SRC)/lib/libslp
35 37 DOC=$(SLPDIR)/javadoc
36 38 CLASSES=$(SLPDIR)/classes
37 39 SLPJAVASRC=$(SLPDIR)/javalib
38 40
39 41 # SLP jar file, its ultimate destination, and packaging details
40 42 SLPJAR=slp.jar
41 43 SLPDJAR=slpd.jar
42 44 JARDESTDIR=$(ROOT)/usr/share/lib/slp
43 45 INSJARS=$(JARDESTDIR)/$(SLPJAR) $(JARDESTDIR)/$(SLPDJAR)
44 46
45 47 $(JARDESTDIR)/%: $(CLASSES)/%
46 48 $(INS.file)
47 49
48 50 # Manifest files
49 51 SLPMANI= $(CLASSES)/manifest.slp
50 52 SLPDMANI= $(CLASSES)/manifest.slpd
51 53
52 54 MANIFESTS= $(SLPMANI) $(SLPDMANI)
53 55
54 56 # Controlled CLASSPATH for making
55 57 SLPCLASSPATH=$(CLASSES):$(SLPJAVASRC)
56 58
57 59 # javac flags
58 60 JFLAGS= -O -d $(CLASSES) -sourcepath $(SLPCLASSPATH)
59 61 JFLAGS += -source 1.6 -target 1.6 -Xlint:deprecation,-options
60 62
61 63 # The default make rule for Java files
62 64 COMPILE.java=$(JAVAC) $(JFLAGS)
63 65
64 66 $(CLASSES)/$(PKGPATH)/%.class: $(SLPJAVASRC)/$(PKGPATH)/%.java
65 67 $(COMPILE.java) $<
66 68
67 69 # Where to put the message files
68 70 MSGDIR = $(ROOT)/usr/share/lib/locale/$(PKGPATH)
69 71 MSGDIRS = $(ROOT)/usr/share/lib/locale \
70 72 $(ROOT)/usr/share/lib/locale/com \
71 73 $(ROOT)/usr/share/lib/locale/com/sun \
72 74 $(MSGDIR)
73 75 CLIENT_MSGS=ClientLib_en.properties
74 76 SERVER_MSGS=Server_en.properties
75 77 MSGFILES=$(MSGDIR)/$(CLIENT_MSGS) $(MSGDIR)/$(SERVER_MSGS)
76 78
77 79 $(JARDESTDIR)/$(SLPDJAR) := FILEMODE = 600
78 80
79 81
80 82 # All SLP classes, not including internal classes (since these are
81 83 # generated and packaged automatically buy this Makefile). Since
82 84 # we take advantage of -Xdepend, the strategy is to place trigger
83 85 # classes at the beginning of the list; these will trigger javac to
84 86 # compile all other classes.
85 87 SLP_CLASSES=\
86 88 UARequester.class SARequester.class slpd.class \
87 89 SunServerDATable.class AttributeVerifier.class \
88 90 SunDATable.class SLPHeaderV2.class SLPServerHeaderV2.class \
89 91 SLPHeaderV1.class SLPV1Manager.class Syslog.class \
90 92 StderrLog.class SLPDgui.class \
91 93 ServiceLocationException.class ServiceLocationEnumeration.class \
92 94 ServiceLocationEnumerator.class Assert.class \
93 95 ServiceType.class ServiceURL.class \
94 96 ServiceLocationAttribute.class ServerAttribute.class \
95 97 AttributeString.class AttributePattern.class \
96 98 Opaque.class AuthBlock.class \
97 99 Defaults.class SLPConfig.class \
98 100 SrvLocMsg.class SrvLocHeader.class\
99 101 SrvLocMsgImpl.class CAttrMsg.class \
100 102 SAttrMsg.class CDAAdvert.class \
101 103 SDAAdvert.class CSAAdvert.class \
102 104 SSAAdvert.class CSrvMsg.class \
103 105 SSrvMsg.class CSrvTypeMsg.class \
104 106 SSrvTypeMsg.class CSrvReg.class \
105 107 SSrvReg.class CSrvDereg.class \
106 108 SSrvDereg.class DATable.class \
107 109 ServiceStore.class ServiceStoreFactory.class \
108 110 ServiceTable.class ServiceStoreInMemory.class \
109 111 Advertiser.class Locator.class \
110 112 ServiceLocationManager.class PermSARegTable.class \
111 113 DAAdvertiser.class ServerDATable.class \
112 114 Listener.class StreamListener.class \
113 115 RequestHandler.class Transact.class \
114 116 SLPV1SAttrMsg.class SLPV1SDAAdvert.class \
115 117 SLPV1SSrvDereg.class SLPV1SSrvMsg.class \
116 118 SLPV1SSrvReg.class SLPV1SSrvTypeMsg.class \
117 119 ServiceLocationAttributeV1.class ServiceURLV1.class \
118 120 SLPTemplateRegistry.class ActiveDiscoverer.class \
119 121 AttributeDescriptor.class ClientMsgManager.class \
120 122 IANACharCode.class Parser.class \
121 123 ServiceLocationAttributeVerifier.class SLPV1CDAAdvert.class \
122 124 URLAttributeVerifier.class TemplateRegistry.class \
123 125 ServiceLocationAttributeDescriptor.class \
124 126 SLPTokenizer.class
125 127
126 128 # This is a hand-crafted subset of classes that are needed for slp.jar.
127 129 # We take the extra effort here so that customers don't need to pull
128 130 # in slpd.jar, which is more than double the size of slp.jar, when
129 131 # they will only need these classes.
130 132 UA_SA_SUBSET_CLASSES_ORIG=\
131 133 Advertiser.class Assert.class AttributeString.class \
132 134 AuthBlock.class CAttrMsg.class CDAAdvert.class \
133 135 CSAAdvert.class CSrvDereg.class CSrvMsg.class \
134 136 CSrvReg.class CSrvTypeMsg.class DATable\$$DARecord.class \
135 137 SLPHeaderV2.class SrvLocHeader.class SrvLocMsgImpl.class \
136 138 DATable.class Defaults.class \
137 139 Locator.class Opaque.class PermSARegTable.class \
138 140 SARequester.class SLPConfig.class Syslog.class \
139 141 ServiceURL.class SrvLocMsg.class Transact.class \
140 142 ServerAttribute.class ServiceLocationAttribute.class \
141 143 ServiceLocationEnumeration.class ServiceLocationEnumerator.class \
142 144 ServiceLocationException.class ServiceType.class \
143 145 UARequester.class ServiceLocationManager.class \
144 146 SunDATable.class TemplateRegistry.class SLPTemplateRegistry.class \
145 147 ServiceLocationAttributeVerifier.class AttributeVerifier.class \
146 148 ServiceLocationAttributeDescriptor.class AttributeDescriptor.class \
147 149 URLAttributeVerifier.class StderrLog.class \
148 150 StderrLog.class SLPConfig\$$SLPProperties.class \
149 151 SLPHeaderV2\$$OptionParser.class SLPHeaderV2\$$SLPOption.class \
150 152 SLPTokenizer.class
151 153
152 154 ALL_SLP_CLASSES=${SLP_CLASSES:%=$(CLASSES)/$(PKGPATH)/%}
153 155 UA_SA_SUBSET_CLASSES=${UA_SA_SUBSET_CLASSES_ORIG:%=$(PKGPATH)/%}
|
↓ open down ↓ |
119 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX