equal
deleted
inserted
replaced
68 POLICY_BUILD = $(LIBDIR)/security/java.policy |
68 POLICY_BUILD = $(LIBDIR)/security/java.policy |
69 |
69 |
70 CACERTS_SRC = $(CACERTS_FILE) |
70 CACERTS_SRC = $(CACERTS_FILE) |
71 CACERTS_BUILD = $(LIBDIR)/security/cacerts |
71 CACERTS_BUILD = $(LIBDIR)/security/cacerts |
72 |
72 |
|
73 BLACKLISTED_CERTS_SRC = $(TOPDIR)/src/share/lib/security/blacklisted.certs |
|
74 BLACKLISTED_CERTS_BUILD = $(LIBDIR)/security/blacklisted.certs |
|
75 |
73 ifndef OPENJDK |
76 ifndef OPENJDK |
74 BLACKLIST_SRC = $(CLOSED_SHARE_SRC)/lib/security/blacklist |
77 BLACKLIST_SRC = $(CLOSED_SHARE_SRC)/lib/security/blacklist |
75 BLACKLIST_BUILD = $(LIBDIR)/security/blacklist |
78 BLACKLIST_BUILD = $(LIBDIR)/security/blacklist |
|
79 BLACKLISTED_CERTS_SRC += $(wildcard $(CLOSED_SHARE_SRC)/lib/security/blacklisted.certs) |
76 TRUSTEDLIBS_SRC = $(CLOSED_SHARE_SRC)/lib/security/trusted.libraries |
80 TRUSTEDLIBS_SRC = $(CLOSED_SHARE_SRC)/lib/security/trusted.libraries |
77 TRUSTEDLIBS_BUILD = $(LIBDIR)/security/trusted.libraries |
81 TRUSTEDLIBS_BUILD = $(LIBDIR)/security/trusted.libraries |
78 endif |
82 endif |
79 |
83 |
80 FILES_class = $(FILES_java:%.java=$(CLASSBINDIR)/%.class) |
84 FILES_class = $(FILES_java:%.java=$(CLASSBINDIR)/%.class) |
83 # Rules |
87 # Rules |
84 # |
88 # |
85 include $(BUILDDIR)/common/Rules.gmk |
89 include $(BUILDDIR)/common/Rules.gmk |
86 |
90 |
87 ifdef OPENJDK |
91 ifdef OPENJDK |
88 build: properties policy cacerts |
92 build: properties policy cacerts blacklisted-certs |
89 else |
93 else |
90 build: properties policy cacerts blacklist trustedlibs |
94 build: properties policy cacerts blacklist blacklisted-certs trustedlibs |
91 endif |
95 endif |
92 |
96 |
93 install: all |
97 install: all |
94 |
98 |
95 properties: classes $(PROPS_BUILD) |
99 properties: classes $(PROPS_BUILD) |
97 policy: classes $(POLICY_BUILD) |
101 policy: classes $(POLICY_BUILD) |
98 |
102 |
99 cacerts: classes $(CACERTS_BUILD) |
103 cacerts: classes $(CACERTS_BUILD) |
100 |
104 |
101 blacklist: classes $(BLACKLIST_BUILD) |
105 blacklist: classes $(BLACKLIST_BUILD) |
|
106 |
|
107 blacklisted-certs: classes $(BLACKLISTED_CERTS_BUILD) |
102 |
108 |
103 trustedlibs: classes $(TRUSTEDLIBS_BUILD) |
109 trustedlibs: classes $(TRUSTEDLIBS_BUILD) |
104 |
110 |
105 $(PROPS_BUILD): $(PROPS_SRC) |
111 $(PROPS_BUILD): $(PROPS_SRC) |
106 $(install-file) |
112 $(install-file) |
112 $(install-file) |
118 $(install-file) |
113 |
119 |
114 $(BLACKLIST_BUILD): $(BLACKLIST_SRC) |
120 $(BLACKLIST_BUILD): $(BLACKLIST_SRC) |
115 $(install-file) |
121 $(install-file) |
116 |
122 |
|
123 $(BLACKLISTED_CERTS_BUILD): $(BLACKLISTED_CERTS_SRC) |
|
124 $(MKDIR) -p $(@D) |
|
125 $(CAT) $^ | $(SED) '/^$$/d' | $(SORT) | $(UNIQ) > $@.tmp |
|
126 $(GREP) -i Algorithm $@.tmp > $@ |
|
127 if [ `$(SED) -n -e "$$=" $@` != 1 ]; then \ |
|
128 $(ECHO) "Different algorithms defined in $^"; \ |
|
129 $(RM) $@ $@.tmp; \ |
|
130 false; \ |
|
131 fi |
|
132 $(GREP) -iv Algorithm $@.tmp >> $@ |
|
133 $(RM) $@.tmp |
|
134 |
117 $(TRUSTEDLIBS_BUILD): $(TRUSTEDLIBS_SRC) |
135 $(TRUSTEDLIBS_BUILD): $(TRUSTEDLIBS_SRC) |
118 $(install-file) |
136 $(install-file) |
119 |
137 |
120 clean clobber:: .delete.classlist |
138 clean clobber:: .delete.classlist |
121 $(RM) -r $(CLASSBINDIR)/java/security |
139 $(RM) -r $(CLASSBINDIR)/java/security |
122 $(RM) $(PROPS_BUILD) $(POLICY_BUILD) $(CACERTS_BUILD) $(BLACKLIST_BUILD) $(TRUSTEDLIBS_BUILD) |
140 $(RM) $(PROPS_BUILD) $(POLICY_BUILD) $(CACERTS_BUILD) $(BLACKLIST_BUILD) \ |
|
141 $(BLACKLISTED_CERTS_BUILD) $(TRUSTEDLIBS_BUILD) |
123 |
142 |
124 # Additional Rule for building sun.security.util |
143 # Additional Rule for building sun.security.util |
125 $(CLASSBINDIR)/%.class: $(SHARE_SRC)/sun/%.java |
144 $(CLASSBINDIR)/%.class: $(SHARE_SRC)/sun/%.java |
126 @$(ECHO) $? >> $(TEMPDIR)/.classes.list |
145 @$(ECHO) $? >> $(TEMPDIR)/.classes.list |
127 |
146 |