equal
deleted
inserted
replaced
99 fi |
99 fi |
100 if test -f $with_add_source_root/hotspot/makefiles/Makefile || \ |
100 if test -f $with_add_source_root/hotspot/makefiles/Makefile || \ |
101 test -f $with_add_source_root/hotspot/make/Makefile; then |
101 test -f $with_add_source_root/hotspot/make/Makefile; then |
102 AC_MSG_ERROR([Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources.]) |
102 AC_MSG_ERROR([Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources.]) |
103 fi |
103 fi |
|
104 if test -f $with_add_source_root/nashorn/makefiles/Makefile || \ |
|
105 test -f $with_add_source_root/nashorn/make/Makefile; then |
|
106 AC_MSG_ERROR([Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources.]) |
|
107 fi |
104 if test -f $with_add_source_root/jdk/makefiles/Makefile || \ |
108 if test -f $with_add_source_root/jdk/makefiles/Makefile || \ |
105 test -f $with_add_source_root/jdk/make/Makefile; then |
109 test -f $with_add_source_root/jdk/make/Makefile; then |
106 AC_MSG_ERROR([Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources.]) |
110 AC_MSG_ERROR([Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources.]) |
107 fi |
111 fi |
108 fi |
112 fi |
133 AC_MSG_ERROR([Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override.]) |
137 AC_MSG_ERROR([Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override.]) |
134 fi |
138 fi |
135 if test -f $with_override_source_root/hotspot/makefiles/Makefile || \ |
139 if test -f $with_override_source_root/hotspot/makefiles/Makefile || \ |
136 test -f $with_override_source_root/hotspot/make/Makefile; then |
140 test -f $with_override_source_root/hotspot/make/Makefile; then |
137 AC_MSG_ERROR([Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override.]) |
141 AC_MSG_ERROR([Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override.]) |
|
142 fi |
|
143 if test -f $with_override_source_root/nashorn/makefiles/Makefile || \ |
|
144 test -f $with_override_source_root/nashorn/make/Makefile; then |
|
145 AC_MSG_ERROR([Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override.]) |
138 fi |
146 fi |
139 if test -f $with_override_source_root/jdk/makefiles/Makefile || \ |
147 if test -f $with_override_source_root/jdk/makefiles/Makefile || \ |
140 test -f $with_override_source_root/jdk/make/Makefile; then |
148 test -f $with_override_source_root/jdk/make/Makefile; then |
141 AC_MSG_ERROR([Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override.]) |
149 AC_MSG_ERROR([Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override.]) |
142 fi |
150 fi |
175 [use this jaxws dir for the build])]) |
183 [use this jaxws dir for the build])]) |
176 |
184 |
177 AC_ARG_WITH(override-hotspot, [AS_HELP_STRING([--with-override-hotspot], |
185 AC_ARG_WITH(override-hotspot, [AS_HELP_STRING([--with-override-hotspot], |
178 [use this hotspot dir for the build])]) |
186 [use this hotspot dir for the build])]) |
179 |
187 |
|
188 AC_ARG_WITH(override-nashorn, [AS_HELP_STRING([--with-override-nashorn], |
|
189 [use this nashorn dir for the build])]) |
|
190 |
180 AC_ARG_WITH(override-jdk, [AS_HELP_STRING([--with-override-jdk], |
191 AC_ARG_WITH(override-jdk, [AS_HELP_STRING([--with-override-jdk], |
181 [use this jdk dir for the build])]) |
192 [use this jdk dir for the build])]) |
182 |
193 |
183 if test "x$with_override_langtools" != x; then |
194 if test "x$with_override_langtools" != x; then |
184 CURDIR="$PWD" |
195 CURDIR="$PWD" |
239 if test "x$with_override_nashorn" != x; then |
250 if test "x$with_override_nashorn" != x; then |
240 CURDIR="$PWD" |
251 CURDIR="$PWD" |
241 cd "$with_override_nashorn" |
252 cd "$with_override_nashorn" |
242 NASHORN_TOPDIR="`pwd`" |
253 NASHORN_TOPDIR="`pwd`" |
243 cd "$CURDIR" |
254 cd "$CURDIR" |
244 if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then |
255 if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then |
245 AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!]) |
256 AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!]) |
246 fi |
257 fi |
247 AC_MSG_CHECKING([if nashorn should be overridden]) |
258 AC_MSG_CHECKING([if nashorn should be overridden]) |
248 AC_MSG_RESULT([yes with $NASHORN_TOPDIR]) |
259 AC_MSG_RESULT([yes with $NASHORN_TOPDIR]) |
249 fi |
260 fi |