equal
deleted
inserted
replaced
1 # |
1 # |
2 # Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # |
4 # |
5 # This code is free software; you can redistribute it and/or modify it |
5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as |
6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. Oracle designates this |
7 # published by the Free Software Foundation. Oracle designates this |
137 # attempt at building. If sources exist, we always want to |
137 # attempt at building. If sources exist, we always want to |
138 # build/use the most recent source instead of an older jce.jar, whether |
138 # build/use the most recent source instead of an older jce.jar, whether |
139 # built implicitly/explicitly. |
139 # built implicitly/explicitly. |
140 # |
140 # |
141 ifeq ($(wildcard $(SHARE_SRC)/classes/javax/crypto/Cipher.java),) |
141 ifeq ($(wildcard $(SHARE_SRC)/classes/javax/crypto/Cipher.java),) |
142 JCEFLAGS = $(CLASSPATH_SEPARATOR)$(LIBDIR)/jce.jar |
142 JCE_PATH = $(CLASSPATH_SEPARATOR)$(LIBDIR)/jce.jar |
143 endif |
143 endif |
144 |
144 |
145 # Add the source level |
145 # Add the source level |
146 SOURCE_LANGUAGE_VERSION = 7 |
146 SOURCE_LANGUAGE_VERSION = 7 |
147 LANGUAGE_VERSION = -source $(SOURCE_LANGUAGE_VERSION) |
147 LANGUAGE_VERSION = -source $(SOURCE_LANGUAGE_VERSION) |
150 # Add the class version we want |
150 # Add the class version we want |
151 TARGET_CLASS_VERSION = 7 |
151 TARGET_CLASS_VERSION = 7 |
152 CLASS_VERSION = -target $(TARGET_CLASS_VERSION) |
152 CLASS_VERSION = -target $(TARGET_CLASS_VERSION) |
153 JAVACFLAGS += $(CLASS_VERSION) |
153 JAVACFLAGS += $(CLASS_VERSION) |
154 JAVACFLAGS += -encoding ascii |
154 JAVACFLAGS += -encoding ascii |
155 JAVACFLAGS += "-Xbootclasspath:$(CLASSBINDIR)$(JCEFLAGS)" |
155 JAVACFLAGS += "-Xbootclasspath:$(CLASSBINDIR)$(JCE_PATH)" |
156 JAVACFLAGS += $(OTHER_JAVACFLAGS) |
156 JAVACFLAGS += $(OTHER_JAVACFLAGS) |
157 |
157 |
158 # Needed for javah |
158 # Needed for javah |
159 JAVAHFLAGS += -bootclasspath "$(CLASSBINDIR)$(JCEFLAGS)" |
159 JAVAHFLAGS += -bootclasspath "$(CLASSBINDIR)$(JCE_PATH)" |
160 |
160 |
161 # Needed for javadoc to ensure it builds documentation |
161 # Needed for javadoc to ensure it builds documentation |
162 # against the newly built classes |
162 # against the newly built classes |
163 JAVADOCFLAGS += -bootclasspath $(CLASSBINDIR) |
163 JAVADOCFLAGS += -bootclasspath $(CLASSBINDIR) |
164 |
164 |