Mercurial > jdk8-mips64-public / changeset
changeset
8001925: Add useful help messages if freetype is not found on Windows
Tue, 22 Oct 2013 11:12:43 +0200
- author
- ihse
- date
- Tue, 22 Oct 2013 11:12:43 +0200
- changeset 862
- dffe654ab24c
- parent 861
- 1a853fac18ff
- child 863
- 56db38956113
8001925: Add useful help messages if freetype is not found on Windows
Reviewed-by: erikj, tbell
| common/autoconf/generated-configure.sh | file | annotate | diff | comparison | revisions | |
| common/autoconf/help.m4 | file | annotate | diff | comparison | revisions |
1.1 --- a/common/autoconf/generated-configure.sh Mon Oct 21 11:59:25 2013 +0200 1.2 +++ b/common/autoconf/generated-configure.sh Tue Oct 22 11:12:43 2013 +0200 1.3 @@ -3443,16 +3443,42 @@ 1.4 cygwin_help() { 1.5 case $1 in 1.6 unzip) 1.7 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;; 1.8 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip )" 1.9 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.10 + ;; 1.11 zip) 1.12 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;; 1.13 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P zip )" 1.14 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.15 + ;; 1.16 make) 1.17 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;; 1.18 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P make )" 1.19 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.20 + ;; 1.21 + freetype2) 1.22 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 1.23 + HELP_MSG="To install freetype, run: 1.24 +wget \"http://gnuwin32.sourceforge.net/downlinks/freetype.php\" -O /tmp/freetype-setup.exe 1.25 +chmod +x /tmp/freetype-setup.exe 1.26 +/tmp/freetype-setup.exe 1.27 +Follow GUI prompts, and install to default directory \"C:\Program Files (x86)\GnuWin32\". 1.28 +After installation, locate lib/libfreetype.dll.a and make a copy with the name freetype.dll." 1.29 + else 1.30 + HELP_MSG="You need to build a 64-bit version of freetype. 1.31 +This is not readily available. 1.32 +You can find source code and build instructions on 1.33 +http://www.freetype.org/ 1.34 +If you put the resulting build in \"C:\Program Files\GnuWin32\", it will be found automatically." 1.35 + fi 1.36 + ;; 1.37 * ) 1.38 break ;; 1.39 esac 1.40 } 1.41 1.42 +msys_help() { 1.43 + PKGHANDLER_COMMAND="" 1.44 +} 1.45 + 1.46 apt_help() { 1.47 case $1 in 1.48 devkit) 1.49 @@ -3822,7 +3848,7 @@ 1.50 #CUSTOM_AUTOCONF_INCLUDE 1.51 1.52 # Do not change or remove the following line, it is needed for consistency checks: 1.53 -DATE_WHEN_GENERATED=1382349488 1.54 +DATE_WHEN_GENERATED=1382433088 1.55 1.56 ############################################################################### 1.57 # 1.58 @@ -15723,25 +15749,32 @@ 1.59 # Print a helpful message on how to acquire the necessary build dependency. 1.60 # openjdk is the help tag: freetyp2, cups, pulse, alsa etc 1.61 MISSING_DEPENDENCY=openjdk 1.62 - PKGHANDLER_COMMAND= 1.63 - 1.64 - case $PKGHANDLER in 1.65 - apt-get) 1.66 - apt_help $MISSING_DEPENDENCY ;; 1.67 - yum) 1.68 - yum_help $MISSING_DEPENDENCY ;; 1.69 - port) 1.70 - port_help $MISSING_DEPENDENCY ;; 1.71 - pkgutil) 1.72 - pkgutil_help $MISSING_DEPENDENCY ;; 1.73 - pkgadd) 1.74 - pkgadd_help $MISSING_DEPENDENCY ;; 1.75 - * ) 1.76 - break ;; 1.77 - esac 1.78 - 1.79 - if test "x$PKGHANDLER_COMMAND" != x; then 1.80 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.81 + 1.82 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.83 + cygwin_help $MISSING_DEPENDENCY 1.84 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 1.85 + msys_help $MISSING_DEPENDENCY 1.86 + else 1.87 + PKGHANDLER_COMMAND= 1.88 + 1.89 + case $PKGHANDLER in 1.90 + apt-get) 1.91 + apt_help $MISSING_DEPENDENCY ;; 1.92 + yum) 1.93 + yum_help $MISSING_DEPENDENCY ;; 1.94 + port) 1.95 + port_help $MISSING_DEPENDENCY ;; 1.96 + pkgutil) 1.97 + pkgutil_help $MISSING_DEPENDENCY ;; 1.98 + pkgadd) 1.99 + pkgadd_help $MISSING_DEPENDENCY ;; 1.100 + * ) 1.101 + break ;; 1.102 + esac 1.103 + 1.104 + if test "x$PKGHANDLER_COMMAND" != x; then 1.105 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.106 + fi 1.107 fi 1.108 1.109 { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find a valid Boot JDK. $HELP_MSG" >&5 1.110 @@ -19120,25 +19153,32 @@ 1.111 # Print a helpful message on how to acquire the necessary build dependency. 1.112 # devkit is the help tag: freetyp2, cups, pulse, alsa etc 1.113 MISSING_DEPENDENCY=devkit 1.114 - PKGHANDLER_COMMAND= 1.115 - 1.116 - case $PKGHANDLER in 1.117 - apt-get) 1.118 - apt_help $MISSING_DEPENDENCY ;; 1.119 - yum) 1.120 - yum_help $MISSING_DEPENDENCY ;; 1.121 - port) 1.122 - port_help $MISSING_DEPENDENCY ;; 1.123 - pkgutil) 1.124 - pkgutil_help $MISSING_DEPENDENCY ;; 1.125 - pkgadd) 1.126 - pkgadd_help $MISSING_DEPENDENCY ;; 1.127 - * ) 1.128 - break ;; 1.129 - esac 1.130 - 1.131 - if test "x$PKGHANDLER_COMMAND" != x; then 1.132 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.133 + 1.134 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.135 + cygwin_help $MISSING_DEPENDENCY 1.136 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 1.137 + msys_help $MISSING_DEPENDENCY 1.138 + else 1.139 + PKGHANDLER_COMMAND= 1.140 + 1.141 + case $PKGHANDLER in 1.142 + apt-get) 1.143 + apt_help $MISSING_DEPENDENCY ;; 1.144 + yum) 1.145 + yum_help $MISSING_DEPENDENCY ;; 1.146 + port) 1.147 + port_help $MISSING_DEPENDENCY ;; 1.148 + pkgutil) 1.149 + pkgutil_help $MISSING_DEPENDENCY ;; 1.150 + pkgadd) 1.151 + pkgadd_help $MISSING_DEPENDENCY ;; 1.152 + * ) 1.153 + break ;; 1.154 + esac 1.155 + 1.156 + if test "x$PKGHANDLER_COMMAND" != x; then 1.157 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.158 + fi 1.159 fi 1.160 1.161 as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5 1.162 @@ -20692,25 +20732,32 @@ 1.163 # Print a helpful message on how to acquire the necessary build dependency. 1.164 # devkit is the help tag: freetyp2, cups, pulse, alsa etc 1.165 MISSING_DEPENDENCY=devkit 1.166 - PKGHANDLER_COMMAND= 1.167 - 1.168 - case $PKGHANDLER in 1.169 - apt-get) 1.170 - apt_help $MISSING_DEPENDENCY ;; 1.171 - yum) 1.172 - yum_help $MISSING_DEPENDENCY ;; 1.173 - port) 1.174 - port_help $MISSING_DEPENDENCY ;; 1.175 - pkgutil) 1.176 - pkgutil_help $MISSING_DEPENDENCY ;; 1.177 - pkgadd) 1.178 - pkgadd_help $MISSING_DEPENDENCY ;; 1.179 - * ) 1.180 - break ;; 1.181 - esac 1.182 - 1.183 - if test "x$PKGHANDLER_COMMAND" != x; then 1.184 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.185 + 1.186 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.187 + cygwin_help $MISSING_DEPENDENCY 1.188 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 1.189 + msys_help $MISSING_DEPENDENCY 1.190 + else 1.191 + PKGHANDLER_COMMAND= 1.192 + 1.193 + case $PKGHANDLER in 1.194 + apt-get) 1.195 + apt_help $MISSING_DEPENDENCY ;; 1.196 + yum) 1.197 + yum_help $MISSING_DEPENDENCY ;; 1.198 + port) 1.199 + port_help $MISSING_DEPENDENCY ;; 1.200 + pkgutil) 1.201 + pkgutil_help $MISSING_DEPENDENCY ;; 1.202 + pkgadd) 1.203 + pkgadd_help $MISSING_DEPENDENCY ;; 1.204 + * ) 1.205 + break ;; 1.206 + esac 1.207 + 1.208 + if test "x$PKGHANDLER_COMMAND" != x; then 1.209 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.210 + fi 1.211 fi 1.212 1.213 as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5 1.214 @@ -30658,25 +30705,32 @@ 1.215 # Print a helpful message on how to acquire the necessary build dependency. 1.216 # x11 is the help tag: freetyp2, cups, pulse, alsa etc 1.217 MISSING_DEPENDENCY=x11 1.218 - PKGHANDLER_COMMAND= 1.219 - 1.220 - case $PKGHANDLER in 1.221 - apt-get) 1.222 - apt_help $MISSING_DEPENDENCY ;; 1.223 - yum) 1.224 - yum_help $MISSING_DEPENDENCY ;; 1.225 - port) 1.226 - port_help $MISSING_DEPENDENCY ;; 1.227 - pkgutil) 1.228 - pkgutil_help $MISSING_DEPENDENCY ;; 1.229 - pkgadd) 1.230 - pkgadd_help $MISSING_DEPENDENCY ;; 1.231 - * ) 1.232 - break ;; 1.233 - esac 1.234 - 1.235 - if test "x$PKGHANDLER_COMMAND" != x; then 1.236 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.237 + 1.238 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.239 + cygwin_help $MISSING_DEPENDENCY 1.240 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 1.241 + msys_help $MISSING_DEPENDENCY 1.242 + else 1.243 + PKGHANDLER_COMMAND= 1.244 + 1.245 + case $PKGHANDLER in 1.246 + apt-get) 1.247 + apt_help $MISSING_DEPENDENCY ;; 1.248 + yum) 1.249 + yum_help $MISSING_DEPENDENCY ;; 1.250 + port) 1.251 + port_help $MISSING_DEPENDENCY ;; 1.252 + pkgutil) 1.253 + pkgutil_help $MISSING_DEPENDENCY ;; 1.254 + pkgadd) 1.255 + pkgadd_help $MISSING_DEPENDENCY ;; 1.256 + * ) 1.257 + break ;; 1.258 + esac 1.259 + 1.260 + if test "x$PKGHANDLER_COMMAND" != x; then 1.261 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.262 + fi 1.263 fi 1.264 1.265 as_fn_error $? "Could not find X11 libraries. $HELP_MSG" "$LINENO" 5 1.266 @@ -30753,25 +30807,32 @@ 1.267 # Print a helpful message on how to acquire the necessary build dependency. 1.268 # x11 is the help tag: freetyp2, cups, pulse, alsa etc 1.269 MISSING_DEPENDENCY=x11 1.270 - PKGHANDLER_COMMAND= 1.271 - 1.272 - case $PKGHANDLER in 1.273 - apt-get) 1.274 - apt_help $MISSING_DEPENDENCY ;; 1.275 - yum) 1.276 - yum_help $MISSING_DEPENDENCY ;; 1.277 - port) 1.278 - port_help $MISSING_DEPENDENCY ;; 1.279 - pkgutil) 1.280 - pkgutil_help $MISSING_DEPENDENCY ;; 1.281 - pkgadd) 1.282 - pkgadd_help $MISSING_DEPENDENCY ;; 1.283 - * ) 1.284 - break ;; 1.285 - esac 1.286 - 1.287 - if test "x$PKGHANDLER_COMMAND" != x; then 1.288 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.289 + 1.290 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.291 + cygwin_help $MISSING_DEPENDENCY 1.292 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 1.293 + msys_help $MISSING_DEPENDENCY 1.294 + else 1.295 + PKGHANDLER_COMMAND= 1.296 + 1.297 + case $PKGHANDLER in 1.298 + apt-get) 1.299 + apt_help $MISSING_DEPENDENCY ;; 1.300 + yum) 1.301 + yum_help $MISSING_DEPENDENCY ;; 1.302 + port) 1.303 + port_help $MISSING_DEPENDENCY ;; 1.304 + pkgutil) 1.305 + pkgutil_help $MISSING_DEPENDENCY ;; 1.306 + pkgadd) 1.307 + pkgadd_help $MISSING_DEPENDENCY ;; 1.308 + * ) 1.309 + break ;; 1.310 + esac 1.311 + 1.312 + if test "x$PKGHANDLER_COMMAND" != x; then 1.313 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.314 + fi 1.315 fi 1.316 1.317 as_fn_error $? "Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG" "$LINENO" 5 1.318 @@ -31008,25 +31069,32 @@ 1.319 # Print a helpful message on how to acquire the necessary build dependency. 1.320 # cups is the help tag: freetyp2, cups, pulse, alsa etc 1.321 MISSING_DEPENDENCY=cups 1.322 - PKGHANDLER_COMMAND= 1.323 - 1.324 - case $PKGHANDLER in 1.325 - apt-get) 1.326 - apt_help $MISSING_DEPENDENCY ;; 1.327 - yum) 1.328 - yum_help $MISSING_DEPENDENCY ;; 1.329 - port) 1.330 - port_help $MISSING_DEPENDENCY ;; 1.331 - pkgutil) 1.332 - pkgutil_help $MISSING_DEPENDENCY ;; 1.333 - pkgadd) 1.334 - pkgadd_help $MISSING_DEPENDENCY ;; 1.335 - * ) 1.336 - break ;; 1.337 - esac 1.338 - 1.339 - if test "x$PKGHANDLER_COMMAND" != x; then 1.340 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.341 + 1.342 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.343 + cygwin_help $MISSING_DEPENDENCY 1.344 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 1.345 + msys_help $MISSING_DEPENDENCY 1.346 + else 1.347 + PKGHANDLER_COMMAND= 1.348 + 1.349 + case $PKGHANDLER in 1.350 + apt-get) 1.351 + apt_help $MISSING_DEPENDENCY ;; 1.352 + yum) 1.353 + yum_help $MISSING_DEPENDENCY ;; 1.354 + port) 1.355 + port_help $MISSING_DEPENDENCY ;; 1.356 + pkgutil) 1.357 + pkgutil_help $MISSING_DEPENDENCY ;; 1.358 + pkgadd) 1.359 + pkgadd_help $MISSING_DEPENDENCY ;; 1.360 + * ) 1.361 + break ;; 1.362 + esac 1.363 + 1.364 + if test "x$PKGHANDLER_COMMAND" != x; then 1.365 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.366 + fi 1.367 fi 1.368 1.369 as_fn_error $? "Could not find cups! $HELP_MSG " "$LINENO" 5 1.370 @@ -31633,25 +31701,32 @@ 1.371 # Print a helpful message on how to acquire the necessary build dependency. 1.372 # freetype2 is the help tag: freetyp2, cups, pulse, alsa etc 1.373 MISSING_DEPENDENCY=freetype2 1.374 - PKGHANDLER_COMMAND= 1.375 - 1.376 - case $PKGHANDLER in 1.377 - apt-get) 1.378 - apt_help $MISSING_DEPENDENCY ;; 1.379 - yum) 1.380 - yum_help $MISSING_DEPENDENCY ;; 1.381 - port) 1.382 - port_help $MISSING_DEPENDENCY ;; 1.383 - pkgutil) 1.384 - pkgutil_help $MISSING_DEPENDENCY ;; 1.385 - pkgadd) 1.386 - pkgadd_help $MISSING_DEPENDENCY ;; 1.387 - * ) 1.388 - break ;; 1.389 - esac 1.390 - 1.391 - if test "x$PKGHANDLER_COMMAND" != x; then 1.392 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.393 + 1.394 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.395 + cygwin_help $MISSING_DEPENDENCY 1.396 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 1.397 + msys_help $MISSING_DEPENDENCY 1.398 + else 1.399 + PKGHANDLER_COMMAND= 1.400 + 1.401 + case $PKGHANDLER in 1.402 + apt-get) 1.403 + apt_help $MISSING_DEPENDENCY ;; 1.404 + yum) 1.405 + yum_help $MISSING_DEPENDENCY ;; 1.406 + port) 1.407 + port_help $MISSING_DEPENDENCY ;; 1.408 + pkgutil) 1.409 + pkgutil_help $MISSING_DEPENDENCY ;; 1.410 + pkgadd) 1.411 + pkgadd_help $MISSING_DEPENDENCY ;; 1.412 + * ) 1.413 + break ;; 1.414 + esac 1.415 + 1.416 + if test "x$PKGHANDLER_COMMAND" != x; then 1.417 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.418 + fi 1.419 fi 1.420 1.421 as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5 1.422 @@ -32006,25 +32081,32 @@ 1.423 # Print a helpful message on how to acquire the necessary build dependency. 1.424 # alsa is the help tag: freetyp2, cups, pulse, alsa etc 1.425 MISSING_DEPENDENCY=alsa 1.426 - PKGHANDLER_COMMAND= 1.427 - 1.428 - case $PKGHANDLER in 1.429 - apt-get) 1.430 - apt_help $MISSING_DEPENDENCY ;; 1.431 - yum) 1.432 - yum_help $MISSING_DEPENDENCY ;; 1.433 - port) 1.434 - port_help $MISSING_DEPENDENCY ;; 1.435 - pkgutil) 1.436 - pkgutil_help $MISSING_DEPENDENCY ;; 1.437 - pkgadd) 1.438 - pkgadd_help $MISSING_DEPENDENCY ;; 1.439 - * ) 1.440 - break ;; 1.441 - esac 1.442 - 1.443 - if test "x$PKGHANDLER_COMMAND" != x; then 1.444 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.445 + 1.446 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.447 + cygwin_help $MISSING_DEPENDENCY 1.448 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 1.449 + msys_help $MISSING_DEPENDENCY 1.450 + else 1.451 + PKGHANDLER_COMMAND= 1.452 + 1.453 + case $PKGHANDLER in 1.454 + apt-get) 1.455 + apt_help $MISSING_DEPENDENCY ;; 1.456 + yum) 1.457 + yum_help $MISSING_DEPENDENCY ;; 1.458 + port) 1.459 + port_help $MISSING_DEPENDENCY ;; 1.460 + pkgutil) 1.461 + pkgutil_help $MISSING_DEPENDENCY ;; 1.462 + pkgadd) 1.463 + pkgadd_help $MISSING_DEPENDENCY ;; 1.464 + * ) 1.465 + break ;; 1.466 + esac 1.467 + 1.468 + if test "x$PKGHANDLER_COMMAND" != x; then 1.469 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.470 + fi 1.471 fi 1.472 1.473 as_fn_error $? "Could not find alsa! $HELP_MSG " "$LINENO" 5 1.474 @@ -34818,25 +34900,32 @@ 1.475 # Print a helpful message on how to acquire the necessary build dependency. 1.476 # ccache is the help tag: freetyp2, cups, pulse, alsa etc 1.477 MISSING_DEPENDENCY=ccache 1.478 - PKGHANDLER_COMMAND= 1.479 - 1.480 - case $PKGHANDLER in 1.481 - apt-get) 1.482 - apt_help $MISSING_DEPENDENCY ;; 1.483 - yum) 1.484 - yum_help $MISSING_DEPENDENCY ;; 1.485 - port) 1.486 - port_help $MISSING_DEPENDENCY ;; 1.487 - pkgutil) 1.488 - pkgutil_help $MISSING_DEPENDENCY ;; 1.489 - pkgadd) 1.490 - pkgadd_help $MISSING_DEPENDENCY ;; 1.491 - * ) 1.492 - break ;; 1.493 - esac 1.494 - 1.495 - if test "x$PKGHANDLER_COMMAND" != x; then 1.496 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.497 + 1.498 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.499 + cygwin_help $MISSING_DEPENDENCY 1.500 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 1.501 + msys_help $MISSING_DEPENDENCY 1.502 + else 1.503 + PKGHANDLER_COMMAND= 1.504 + 1.505 + case $PKGHANDLER in 1.506 + apt-get) 1.507 + apt_help $MISSING_DEPENDENCY ;; 1.508 + yum) 1.509 + yum_help $MISSING_DEPENDENCY ;; 1.510 + port) 1.511 + port_help $MISSING_DEPENDENCY ;; 1.512 + pkgutil) 1.513 + pkgutil_help $MISSING_DEPENDENCY ;; 1.514 + pkgadd) 1.515 + pkgadd_help $MISSING_DEPENDENCY ;; 1.516 + * ) 1.517 + break ;; 1.518 + esac 1.519 + 1.520 + if test "x$PKGHANDLER_COMMAND" != x; then 1.521 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 1.522 + fi 1.523 fi 1.524 1.525 printf "$HELP_MSG\n"
2.1 --- a/common/autoconf/help.m4 Mon Oct 21 11:59:25 2013 +0200 2.2 +++ b/common/autoconf/help.m4 Tue Oct 22 11:12:43 2013 +0200 2.3 @@ -33,41 +33,74 @@ 2.4 # Print a helpful message on how to acquire the necessary build dependency. 2.5 # $1 is the help tag: freetyp2, cups, pulse, alsa etc 2.6 MISSING_DEPENDENCY=$1 2.7 - PKGHANDLER_COMMAND= 2.8 2.9 - case $PKGHANDLER in 2.10 - apt-get) 2.11 - apt_help $MISSING_DEPENDENCY ;; 2.12 - yum) 2.13 - yum_help $MISSING_DEPENDENCY ;; 2.14 - port) 2.15 - port_help $MISSING_DEPENDENCY ;; 2.16 - pkgutil) 2.17 - pkgutil_help $MISSING_DEPENDENCY ;; 2.18 - pkgadd) 2.19 - pkgadd_help $MISSING_DEPENDENCY ;; 2.20 - * ) 2.21 - break ;; 2.22 - esac 2.23 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 2.24 + cygwin_help $MISSING_DEPENDENCY 2.25 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 2.26 + msys_help $MISSING_DEPENDENCY 2.27 + else 2.28 + PKGHANDLER_COMMAND= 2.29 2.30 - if test "x$PKGHANDLER_COMMAND" != x; then 2.31 - HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 2.32 + case $PKGHANDLER in 2.33 + apt-get) 2.34 + apt_help $MISSING_DEPENDENCY ;; 2.35 + yum) 2.36 + yum_help $MISSING_DEPENDENCY ;; 2.37 + port) 2.38 + port_help $MISSING_DEPENDENCY ;; 2.39 + pkgutil) 2.40 + pkgutil_help $MISSING_DEPENDENCY ;; 2.41 + pkgadd) 2.42 + pkgadd_help $MISSING_DEPENDENCY ;; 2.43 + * ) 2.44 + break ;; 2.45 + esac 2.46 + 2.47 + if test "x$PKGHANDLER_COMMAND" != x; then 2.48 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 2.49 + fi 2.50 fi 2.51 ]) 2.52 2.53 cygwin_help() { 2.54 case $1 in 2.55 unzip) 2.56 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;; 2.57 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip )" 2.58 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 2.59 + ;; 2.60 zip) 2.61 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;; 2.62 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P zip )" 2.63 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 2.64 + ;; 2.65 make) 2.66 - PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;; 2.67 + PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P make )" 2.68 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." 2.69 + ;; 2.70 + freetype2) 2.71 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 2.72 + HELP_MSG="To install freetype, run: 2.73 +wget \"http://gnuwin32.sourceforge.net/downlinks/freetype.php\" -O /tmp/freetype-setup.exe 2.74 +chmod +x /tmp/freetype-setup.exe 2.75 +/tmp/freetype-setup.exe 2.76 +Follow GUI prompts, and install to default directory \"C:\Program Files (x86)\GnuWin32\". 2.77 +After installation, locate lib/libfreetype.dll.a and make a copy with the name freetype.dll." 2.78 + else 2.79 + HELP_MSG="You need to build a 64-bit version of freetype. 2.80 +This is not readily available. 2.81 +You can find source code and build instructions on 2.82 +http://www.freetype.org/ 2.83 +If you put the resulting build in \"C:\Program Files\GnuWin32\", it will be found automatically." 2.84 + fi 2.85 + ;; 2.86 * ) 2.87 break ;; 2.88 esac 2.89 } 2.90 2.91 +msys_help() { 2.92 + PKGHANDLER_COMMAND="" 2.93 +} 2.94 + 2.95 apt_help() { 2.96 case $1 in 2.97 devkit)
