Skip to content

Commit 7e511ab

Browse files
8193512: Remove remnants of javah from jdk/jdk repo
Reviewed-by: tbell, erikj, alanb, darcy
1 parent 949659e commit 7e511ab

22 files changed

Lines changed: 15 additions & 363 deletions

make/Images.gmk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
210210
jarsigner.1 \
211211
javac.1 \
212212
javadoc.1 \
213-
javah.1 \
214213
javap.1 \
215214
jconsole.1 \
216215
jcmd.1 \

make/RunTestsPrebuiltSpec.gmk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ OPENJDK_BUILD_CPU_ENDIAN := $(OPENJDK_TARGET_CPU_ENDIAN)
110110
# Java executable definitions
111111
JAVA_CMD := $(BOOT_JDK)/bin/java
112112
JAVAC_CMD := $(BOOT_JDK)/bin/javac
113-
JAVAH_CMD := $(BOOT_JDK)/bin/javah
114113
JAR_CMD := $(BOOT_JDK)/bin/jar
115114
JLINK_CMD := $(JDK_OUTPUTDIR)/bin/jlink
116115
JMOD_CMD := $(JDK_OUTPUTDIR)/bin/jmod
@@ -120,7 +119,6 @@ JAVA := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
120119
JAVA_SMALL := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
121120
JAVA_JAVAC := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
122121
JAVAC := $(FIXPATH) $(JAVAC_CMD)
123-
JAVAH := $(FIXPATH) $(JAVAH_CMD)
124122
JAR := $(FIXPATH) $(JAR_CMD)
125123
JLINK := $(FIXPATH) $(JLINK_CMD)
126124
JMOD := $(FIXPATH) $(JMOD_CMD)

make/autoconf/boot-jdk.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
295295
# Setup tools from the Boot JDK.
296296
BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA, java)
297297
BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC, javac)
298-
BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAH, javah)
299298
BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVADOC, javadoc)
300299
BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR, jar)
301300
BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JARSIGNER, jarsigner)

make/autoconf/bootcycle-spec.gmk.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,6 @@ SJAVAC_SERVER_DIR:=$(patsubst $(OLD_OUTPUTDIR)%, $(OUTPUTDIR)%, $(SJAVAC_SERVER_
5252

5353
JAVA_CMD:=$(BOOT_JDK)/bin/java
5454
JAVAC_CMD:=$(BOOT_JDK)/bin/javac
55-
JAVAH_CMD:=$(BOOT_JDK)/bin/javah
5655
JAR_CMD:=$(BOOT_JDK)/bin/jar
5756
JARSIGNER_CMD:=$(BOOT_JDK)/bin/jarsigner
5857
SJAVAC_SERVER_JAVA_CMD:=$(JAVA_CMD)

make/autoconf/generated-configure.sh

Lines changed: 2 additions & 155 deletions
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,6 @@ BOOT_JDK_SOURCETARGET
881881
JARSIGNER
882882
JAR
883883
JAVADOC
884-
JAVAH
885884
JAVAC
886885
JAVA
887886
BOOT_JDK
@@ -1093,7 +1092,6 @@ infodir
10931092
docdir
10941093
oldincludedir
10951094
includedir
1096-
runstatedir
10971095
localstatedir
10981096
sharedstatedir
10991097
sysconfdir
@@ -1300,7 +1298,6 @@ SETFILE
13001298
PKG_CONFIG
13011299
JAVA
13021300
JAVAC
1303-
JAVAH
13041301
JAVADOC
13051302
JAR
13061303
JARSIGNER
@@ -1384,7 +1381,6 @@ datadir='${datarootdir}'
13841381
sysconfdir='${prefix}/etc'
13851382
sharedstatedir='${prefix}/com'
13861383
localstatedir='${prefix}/var'
1387-
runstatedir='${localstatedir}/run'
13881384
includedir='${prefix}/include'
13891385
oldincludedir='/usr/include'
13901386
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1637,15 +1633,6 @@ do
16371633
| -silent | --silent | --silen | --sile | --sil)
16381634
silent=yes ;;
16391635

1640-
-runstatedir | --runstatedir | --runstatedi | --runstated \
1641-
| --runstate | --runstat | --runsta | --runst | --runs \
1642-
| --run | --ru | --r)
1643-
ac_prev=runstatedir ;;
1644-
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1645-
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1646-
| --run=* | --ru=* | --r=*)
1647-
runstatedir=$ac_optarg ;;
1648-
16491636
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
16501637
ac_prev=sbindir ;;
16511638
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1783,7 +1770,7 @@ fi
17831770
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
17841771
datadir sysconfdir sharedstatedir localstatedir includedir \
17851772
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1786-
libdir localedir mandir runstatedir
1773+
libdir localedir mandir
17871774
do
17881775
eval ac_val=\$$ac_var
17891776
# Remove trailing slashes.
@@ -1936,7 +1923,6 @@ Fine tuning of the installation directories:
19361923
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
19371924
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
19381925
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
1939-
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
19401926
--libdir=DIR object code libraries [EPREFIX/lib]
19411927
--includedir=DIR C header files [PREFIX/include]
19421928
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -2271,7 +2257,6 @@ Some influential environment variables:
22712257
PKG_CONFIG path to pkg-config utility
22722258
JAVA Override default value for JAVA
22732259
JAVAC Override default value for JAVAC
2274-
JAVAH Override default value for JAVAH
22752260
JAVADOC Override default value for JAVADOC
22762261
JAR Override default value for JAR
22772262
JARSIGNER Override default value for JARSIGNER
@@ -5187,7 +5172,7 @@ VS_SDK_PLATFORM_NAME_2013=
51875172
#CUSTOM_AUTOCONF_INCLUDE
51885173

51895174
# Do not change or remove the following line, it is needed for consistency checks:
5190-
DATE_WHEN_GENERATED=1513702260
5175+
DATE_WHEN_GENERATED=1513805283
51915176

51925177
###############################################################################
51935178
#
@@ -30920,144 +30905,6 @@ $as_echo "$tool_specified" >&6; }
3092030905

3092130906

3092230907

30923-
# Use user overridden value if available, otherwise locate tool in the Boot JDK.
30924-
30925-
# Publish this variable in the help.
30926-
30927-
30928-
if [ -z "${JAVAH+x}" ]; then
30929-
# The variable is not set by user, try to locate tool using the code snippet
30930-
30931-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for javah in Boot JDK" >&5
30932-
$as_echo_n "checking for javah in Boot JDK... " >&6; }
30933-
JAVAH=$BOOT_JDK/bin/javah
30934-
if test ! -x $JAVAH; then
30935-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
30936-
$as_echo "not found" >&6; }
30937-
{ $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&5
30938-
$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&6;}
30939-
as_fn_error $? "Could not find javah in the Boot JDK" "$LINENO" 5
30940-
fi
30941-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
30942-
$as_echo "ok" >&6; }
30943-
30944-
30945-
else
30946-
# The variable is set, but is it from the command line or the environment?
30947-
30948-
# Try to remove the string !JAVAH! from our list.
30949-
try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!JAVAH!/}
30950-
if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
30951-
# If it failed, the variable was not from the command line. Ignore it,
30952-
# but warn the user (except for BASH, which is always set by the calling BASH).
30953-
if test "xJAVAH" != xBASH; then
30954-
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of JAVAH from the environment. Use command line variables instead." >&5
30955-
$as_echo "$as_me: WARNING: Ignoring value of JAVAH from the environment. Use command line variables instead." >&2;}
30956-
fi
30957-
# Try to locate tool using the code snippet
30958-
30959-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for javah in Boot JDK" >&5
30960-
$as_echo_n "checking for javah in Boot JDK... " >&6; }
30961-
JAVAH=$BOOT_JDK/bin/javah
30962-
if test ! -x $JAVAH; then
30963-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
30964-
$as_echo "not found" >&6; }
30965-
{ $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&5
30966-
$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&6;}
30967-
as_fn_error $? "Could not find javah in the Boot JDK" "$LINENO" 5
30968-
fi
30969-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
30970-
$as_echo "ok" >&6; }
30971-
30972-
30973-
else
30974-
# If it succeeded, then it was overridden by the user. We will use it
30975-
# for the tool.
30976-
30977-
# First remove it from the list of overridden variables, so we can test
30978-
# for unknown variables in the end.
30979-
CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
30980-
30981-
# Check if we try to supply an empty value
30982-
if test "x$JAVAH" = x; then
30983-
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting user supplied tool JAVAH= (no value)" >&5
30984-
$as_echo "$as_me: Setting user supplied tool JAVAH= (no value)" >&6;}
30985-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAVAH" >&5
30986-
$as_echo_n "checking for JAVAH... " >&6; }
30987-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
30988-
$as_echo "disabled" >&6; }
30989-
else
30990-
# Check if the provided tool contains a complete path.
30991-
tool_specified="$JAVAH"
30992-
tool_basename="${tool_specified##*/}"
30993-
if test "x$tool_basename" = "x$tool_specified"; then
30994-
# A command without a complete path is provided, search $PATH.
30995-
{ $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool JAVAH=$tool_basename" >&5
30996-
$as_echo "$as_me: Will search for user supplied tool JAVAH=$tool_basename" >&6;}
30997-
# Extract the first word of "$tool_basename", so it can be a program name with args.
30998-
set dummy $tool_basename; ac_word=$2
30999-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
31000-
$as_echo_n "checking for $ac_word... " >&6; }
31001-
if ${ac_cv_path_JAVAH+:} false; then :
31002-
$as_echo_n "(cached) " >&6
31003-
else
31004-
case $JAVAH in
31005-
[\\/]* | ?:[\\/]*)
31006-
ac_cv_path_JAVAH="$JAVAH" # Let the user override the test with a path.
31007-
;;
31008-
*)
31009-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
31010-
for as_dir in $PATH
31011-
do
31012-
IFS=$as_save_IFS
31013-
test -z "$as_dir" && as_dir=.
31014-
for ac_exec_ext in '' $ac_executable_extensions; do
31015-
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
31016-
ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext"
31017-
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
31018-
break 2
31019-
fi
31020-
done
31021-
done
31022-
IFS=$as_save_IFS
31023-
31024-
;;
31025-
esac
31026-
fi
31027-
JAVAH=$ac_cv_path_JAVAH
31028-
if test -n "$JAVAH"; then
31029-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAH" >&5
31030-
$as_echo "$JAVAH" >&6; }
31031-
else
31032-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
31033-
$as_echo "no" >&6; }
31034-
fi
31035-
31036-
31037-
if test "x$JAVAH" = x; then
31038-
as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
31039-
fi
31040-
else
31041-
# Otherwise we believe it is a complete path. Use it as it is.
31042-
{ $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool JAVAH=$tool_specified" >&5
31043-
$as_echo "$as_me: Will use user supplied tool JAVAH=$tool_specified" >&6;}
31044-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAVAH" >&5
31045-
$as_echo_n "checking for JAVAH... " >&6; }
31046-
if test ! -x "$tool_specified"; then
31047-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
31048-
$as_echo "not found" >&6; }
31049-
as_fn_error $? "User supplied tool JAVAH=$tool_specified does not exist or is not executable" "$LINENO" 5
31050-
fi
31051-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
31052-
$as_echo "$tool_specified" >&6; }
31053-
fi
31054-
fi
31055-
fi
31056-
31057-
fi
31058-
31059-
31060-
3106130908
# Use user overridden value if available, otherwise locate tool in the Boot JDK.
3106230909

3106330910
# Publish this variable in the help.

make/autoconf/spec.gmk.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,6 @@ SJAVAC_SERVER_JAVA_FLAGS:=@SJAVAC_SERVER_JAVA_FLAGS@
540540
# versions of the variables directly.
541541
JAVA_CMD:=@JAVA@
542542
JAVAC_CMD:=@JAVAC@
543-
JAVAH_CMD:=@JAVAH@
544543
JAVADOC_CMD:=@JAVADOC@
545544
JAR_CMD:=@JAR@
546545
JLINK_CMD := @JLINK@
@@ -553,7 +552,6 @@ JAVA=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
553552
JAVA_SMALL=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
554553
JAVA_JAVAC=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_JAVAC) $(JAVA_FLAGS)
555554
JAVAC=@FIXPATH@ $(JAVAC_CMD)
556-
JAVAH=@FIXPATH@ $(JAVAH_CMD)
557555
JAVADOC=@FIXPATH@ $(JAVADOC_CMD)
558556
JAR=@FIXPATH@ $(JAR_CMD)
559557
JLINK = @FIXPATH@ $(JLINK_CMD) $(JAVA_TOOL_FLAGS_SMALL)
@@ -717,7 +715,7 @@ INSTALL_PREFIX=@prefix@
717715
# Directories containing architecture-dependent files should be relative to exec_prefix
718716
INSTALL_EXECPREFIX=@exec_prefix@
719717

720-
# java,javac,javah,javap etc are installed here.
718+
# java,javac,javap etc are installed here.
721719
INSTALL_BINDIR=@bindir@
722720

723721
# Read only architecture-independent data

make/common/JavaCompilation.gmk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@ include ZipArchive.gmk
4646
# passed to SetupJavaCompilation. This name is used as variable prefix.
4747
#
4848
# Remaining parameters are named arguments. These include:
49-
# JVM:=The jvm used to run the javac/javah command
49+
# JVM:=The jvm used to run the javac command
5050
# JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out
5151
# FLAGS:=Flags to be supplied to javac
5252
# SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here

make/gensrc/Gensrc-jdk.compiler.gmk

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -28,11 +28,8 @@ include GensrcCommonLangtools.gmk
2828
$(eval $(call SetupVersionProperties,JAVAC_VERSION, \
2929
com/sun/tools/javac/resources/version.properties))
3030

31-
$(eval $(call SetupVersionProperties,JAVAH_VERSION, \
32-
com/sun/tools/javah/resources/version.properties))
33-
3431
$(eval $(call SetupCompileProperties,COMPILE_PROPERTIES, \
35-
$(JAVAC_VERSION) $(JAVAH_VERSION)))
32+
$(JAVAC_VERSION)))
3633

3734
$(eval $(call SetupParseProperties,PARSE_PROPERTIES, \
3835
com/sun/tools/javac/resources/compiler.properties))

make/langtools/build.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,6 @@ full.version = ${release}+${build.number}
6060
tool.javac.main.class=com.sun.tools.javac.Main
6161
tool.javadoc.main.class=jdk.javadoc.internal.tool.Main
6262
tool.javap.main.class=com.sun.tools.javap.Main
63-
tool.javah.main.class=com.sun.tools.javah.Main
6463
tool.sjavac.main.class=com.sun.tools.sjavac.Main
6564
tool.jshell.main.class=jdk.internal.jshell.tool.JShellToolProvider
6665

make/langtools/build.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
3+
~ Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
44
~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
~
66
~ This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
4141
The output of the build is as follows:
4242
4343
build
44-
|-bin (scripts to invoke various tools, javac, javah etc.)
44+
|-bin (scripts to invoke various tools, javac etc.)
4545
|-genrsc (generated sources - i.e. properties)
4646
|-modules (compiled classes in a modular layout)
4747
|-jtreg (test work/results)
@@ -254,7 +254,6 @@
254254
<build-tool name="javac"/>
255255
<build-tool name="javadoc"/>
256256
<build-tool name="javap"/>
257-
<build-tool name="javah"/>
258257
<build-tool name="jdeps"/>
259258
<build-tool name="sjavac"/>
260259
<build-tool name="jshell"/>

0 commit comments

Comments
 (0)