mirror of
https://github.com/JetBrains/JetBrainsRuntime.git
synced 2025-12-06 01:19:28 +01:00
8367259: Clean up make/scripts and bin directory
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
|
# Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@@ -52,12 +52,39 @@
|
|||||||
# include the SCM state that was used to build it, which can be found in ${JDK_N_INSTALL}/release,
|
# include the SCM state that was used to build it, which can be found in ${JDK_N_INSTALL}/release,
|
||||||
# in property "SOURCE".
|
# in property "SOURCE".
|
||||||
|
|
||||||
|
source_path="$(dirname ${0})"
|
||||||
|
this_script_dir="$(cd -- "${source_path}" > /dev/null && pwd)"
|
||||||
|
if test -z "${this_script_dir}"; then
|
||||||
|
echo "Error: Could not determine location of this script"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
symbols_dir="$(dirname $this_script_dir)/src/jdk.compiler/share/data/symbols"
|
||||||
|
if [ ! -d $symbols_dir ] ; then
|
||||||
|
echo "Cannot locate symbols directory: $symbols_dir" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
generator_dir="$(dirname $this_script_dir)/make/langtools/src/classes/build/tools/symbolgenerator"
|
||||||
|
|
||||||
if [ "$1x" = "x" ] ; then
|
if [ "$1x" = "x" ] ; then
|
||||||
echo "Must provide the target JDK as a parameter:" >&2
|
echo "Must provide the target JDK as a parameter:" >&2
|
||||||
echo "$0 <target-jdk>" >&2
|
echo "$0 <target-jdk>" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
|
if [ ! -d $1 ] ; then
|
||||||
|
echo "Target JDK argument is not a directory:" $1 >&2
|
||||||
|
exit 1
|
||||||
|
fi;
|
||||||
|
|
||||||
|
if [ ! -x $1/bin/java ] ; then
|
||||||
|
echo "Target JDK argument is not a valid JDK: $1" >&2
|
||||||
|
exit 1
|
||||||
|
fi;
|
||||||
|
|
||||||
|
cd $symbols_dir
|
||||||
|
|
||||||
if [ ! -f symbols ] ; then
|
if [ ! -f symbols ] ; then
|
||||||
echo "Must run inside the src/jdk.compiler/share/data/symbols directory" >&2
|
echo "Must run inside the src/jdk.compiler/share/data/symbols directory" >&2
|
||||||
exit 1
|
exit 1
|
||||||
@@ -72,5 +99,5 @@ $1/bin/java --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
|
|||||||
--add-exports jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \
|
--add-exports jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \
|
||||||
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
|
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
|
||||||
--add-modules jdk.jdeps \
|
--add-modules jdk.jdeps \
|
||||||
../../../../../make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java \
|
$generator_dir/CreateSymbols.java \
|
||||||
build-description-incremental symbols include.list
|
build-description-incremental symbols include.list
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
#! /bin/sh -f
|
#! /bin/sh -f
|
||||||
#
|
#
|
||||||
# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
|
# Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@@ -62,7 +62,7 @@ B=`basename "${script_directory}"`
|
|||||||
script_dir="`cd \"${D}\" 2>/dev/null && pwd || echo \"${D}\"`/${B}"
|
script_dir="`cd \"${D}\" 2>/dev/null && pwd || echo \"${D}\"`/${B}"
|
||||||
|
|
||||||
# set up a variable for the template directory
|
# set up a variable for the template directory
|
||||||
template_dir=${script_dir}/../data/license-templates
|
template_dir=${script_dir}/../make/data/license-templates
|
||||||
|
|
||||||
# Check existence of the template directory.
|
# Check existence of the template directory.
|
||||||
if [ ! -d ${template_dir} ] ; then
|
if [ ! -d ${template_dir} ] ; then
|
||||||
@@ -1,191 +0,0 @@
|
|||||||
#
|
|
||||||
# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
|
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
||||||
#
|
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
|
||||||
# under the terms of the GNU General Public License version 2 only, as
|
|
||||||
# published by the Free Software Foundation.
|
|
||||||
#
|
|
||||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
||||||
# version 2 for more details (a copy is included in the LICENSE file that
|
|
||||||
# accompanied this code).
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License version
|
|
||||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
|
||||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
#
|
|
||||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
||||||
# or visit www.oracle.com if you need additional information or have any
|
|
||||||
# questions.
|
|
||||||
#
|
|
||||||
|
|
||||||
src/bsd : jdk/src/bsd
|
|
||||||
src/demo : jdk/src/demo
|
|
||||||
src/java.activation : jaxws/src/java.activation
|
|
||||||
src/java.base : jdk/src/java.base
|
|
||||||
src/java.compiler : langtools/src/java.compiler
|
|
||||||
src/java.corba : corba/src/java.corba
|
|
||||||
src/java.datatransfer : jdk/src/java.datatransfer
|
|
||||||
src/java.desktop : jdk/src/java.desktop
|
|
||||||
src/java.instrument : jdk/src/java.instrument
|
|
||||||
src/java.logging : jdk/src/java.logging
|
|
||||||
src/java.management : jdk/src/java.management
|
|
||||||
src/java.management.rmi : jdk/src/java.management.rmi
|
|
||||||
src/java.naming : jdk/src/java.naming
|
|
||||||
src/java.prefs : jdk/src/java.prefs
|
|
||||||
src/java.rmi : jdk/src/java.rmi
|
|
||||||
src/java.scripting : jdk/src/java.scripting
|
|
||||||
src/java.se : jdk/src/java.se
|
|
||||||
src/java.security.jgss : jdk/src/java.security.jgss
|
|
||||||
src/java.security.sasl : jdk/src/java.security.sasl
|
|
||||||
src/java.se.ee : jdk/src/java.se.ee
|
|
||||||
src/java.smartcardio : jdk/src/java.smartcardio
|
|
||||||
src/java.sql : jdk/src/java.sql
|
|
||||||
src/java.sql.rowset : jdk/src/java.sql.rowset
|
|
||||||
src/java.transaction : jdk/src/java.transaction
|
|
||||||
src/java.xml : jaxp/src/java.xml
|
|
||||||
src/java.xml.bind : jaxws/src/java.xml.bind
|
|
||||||
src/java.xml.crypto : jdk/src/java.xml.crypto
|
|
||||||
src/java.xml.ws : jaxws/src/java.xml.ws
|
|
||||||
src/java.xml.ws.annotation : jaxws/src/java.xml.ws.annotation
|
|
||||||
src/jdk.accessibility : jdk/src/jdk.accessibility
|
|
||||||
src/jdk.aot : hotspot/src/jdk.aot
|
|
||||||
src/jdk.attach : jdk/src/jdk.attach
|
|
||||||
src/jdk.charsets : jdk/src/jdk.charsets
|
|
||||||
src/jdk.compiler : jdk/src/jdk.compiler langtools/src/jdk.compiler
|
|
||||||
src/jdk.crypto.cryptoki : jdk/src/jdk.crypto.cryptoki
|
|
||||||
src/jdk.crypto.ec : jdk/src/jdk.crypto.ec
|
|
||||||
src/jdk.crypto.mscapi : jdk/src/jdk.crypto.mscapi
|
|
||||||
src/jdk.dynalink : nashorn/src/jdk.dynalink
|
|
||||||
src/jdk.editpad : jdk/src/jdk.editpad
|
|
||||||
src/jdk.hotspot.agent : hotspot/src/jdk.hotspot.agent
|
|
||||||
src/jdk.httpserver : jdk/src/jdk.httpserver
|
|
||||||
src/jdk.incubator.httpclient : jdk/src/jdk.incubator.httpclient
|
|
||||||
src/jdk.internal.ed : jdk/src/jdk.internal.ed
|
|
||||||
src/jdk.internal.jvmstat : jdk/src/jdk.internal.jvmstat
|
|
||||||
src/jdk.internal.le : jdk/src/jdk.internal.le
|
|
||||||
src/jdk.internal.opt : jdk/src/jdk.internal.opt
|
|
||||||
src/jdk.internal.vm.ci : hotspot/src/jdk.internal.vm.ci
|
|
||||||
src/jdk.internal.vm.compiler : hotspot/src/jdk.internal.vm.compiler
|
|
||||||
src/jdk.jartool : jdk/src/jdk.jartool
|
|
||||||
src/jdk.javadoc : langtools/src/jdk.javadoc
|
|
||||||
src/jdk.jcmd : jdk/src/jdk.jcmd
|
|
||||||
src/jdk.jconsole : jdk/src/jdk.jconsole
|
|
||||||
src/jdk.jdeps : langtools/src/jdk.jdeps
|
|
||||||
src/jdk.jdi : jdk/src/jdk.jdi
|
|
||||||
src/jdk.jdwp.agent : jdk/src/jdk.jdwp.agent
|
|
||||||
src/jdk.jlink : jdk/src/jdk.jlink
|
|
||||||
src/jdk.jshell : langtools/src/jdk.jshell
|
|
||||||
src/jdk.jstatd : jdk/src/jdk.jstatd
|
|
||||||
src/jdk.localedata : jdk/src/jdk.localedata
|
|
||||||
src/jdk.management : jdk/src/jdk.management
|
|
||||||
src/jdk.management.agent : jdk/src/jdk.management.agent
|
|
||||||
src/jdk.naming.dns : jdk/src/jdk.naming.dns
|
|
||||||
src/jdk.naming.rmi : jdk/src/jdk.naming.rmi
|
|
||||||
src/jdk.net : jdk/src/jdk.net
|
|
||||||
src/jdk.pack : jdk/src/jdk.pack
|
|
||||||
src/jdk.scripting.nashorn : nashorn/src/jdk.scripting.nashorn
|
|
||||||
src/jdk.scripting.nashorn.shell : nashorn/src/jdk.scripting.nashorn.shell
|
|
||||||
src/jdk.sctp : jdk/src/jdk.sctp
|
|
||||||
src/jdk.security.auth : jdk/src/jdk.security.auth
|
|
||||||
src/jdk.security.jgss : jdk/src/jdk.security.jgss
|
|
||||||
src/jdk.unsupported : jdk/src/jdk.unsupported
|
|
||||||
src/jdk.xml.bind : jaxws/src/jdk.xml.bind
|
|
||||||
src/jdk.xml.dom : jaxp/src/jdk.xml.dom
|
|
||||||
src/jdk.xml.ws : jaxws/src/jdk.xml.ws
|
|
||||||
src/jdk.zipfs : jdk/src/jdk.zipfs
|
|
||||||
src/langtools/sample : langtools/src/sample
|
|
||||||
src/linux : jdk/src/linux
|
|
||||||
src/sample : jdk/src/sample
|
|
||||||
src/hotspot/share : hotspot/src/share/vm
|
|
||||||
src/hotspot/cpu/aarch64 : hotspot/src/cpu/aarch64/vm
|
|
||||||
src/hotspot/cpu/arm : hotspot/src/cpu/arm/vm
|
|
||||||
src/hotspot/cpu/ppc : hotspot/src/cpu/ppc/vm
|
|
||||||
src/hotspot/cpu/s390 : hotspot/src/cpu/s390/vm
|
|
||||||
src/hotspot/cpu/x86 : hotspot/src/cpu/x86/vm
|
|
||||||
src/hotspot/cpu/zero : hotspot/src/cpu/zero/vm
|
|
||||||
src/hotspot/os/aix : hotspot/src/os/aix/vm
|
|
||||||
src/hotspot/os/bsd : hotspot/src/os/bsd/vm
|
|
||||||
src/hotspot/os/linux : hotspot/src/os/linux/vm
|
|
||||||
src/hotspot/os/posix/dtrace : hotspot/src/os/posix/dtrace
|
|
||||||
src/hotspot/os/posix : hotspot/src/os/posix/vm
|
|
||||||
src/hotspot/os/windows : hotspot/src/os/windows/vm
|
|
||||||
src/hotspot/os_cpu/aix_ppc : hotspot/src/os_cpu/aix_ppc/vm
|
|
||||||
src/hotspot/os_cpu/bsd_x86 : hotspot/src/os_cpu/bsd_x86/vm
|
|
||||||
src/hotspot/os_cpu/bsd_zero : hotspot/src/os_cpu/bsd_zero/vm
|
|
||||||
src/hotspot/os_cpu/linux_aarch64 : hotspot/src/os_cpu/linux_aarch64/vm
|
|
||||||
src/hotspot/os_cpu/linux_arm : hotspot/src/os_cpu/linux_arm/vm
|
|
||||||
src/hotspot/os_cpu/linux_ppc : hotspot/src/os_cpu/linux_ppc/vm
|
|
||||||
src/hotspot/os_cpu/linux_s390 : hotspot/src/os_cpu/linux_s390/vm
|
|
||||||
src/hotspot/os_cpu/linux_x86 : hotspot/src/os_cpu/linux_x86/vm
|
|
||||||
src/hotspot/os_cpu/linux_zero : hotspot/src/os_cpu/linux_zero/vm
|
|
||||||
src/hotspot/os_cpu/windows_x86 : hotspot/src/os_cpu/windows_x86/vm
|
|
||||||
src/hotspot : hotspot/src
|
|
||||||
src/utils/IdealGraphVisualizer : hotspot/src/share/tools/IdealGraphVisualizer
|
|
||||||
src/utils/LogCompilation : hotspot/src/share/tools/LogCompilation
|
|
||||||
src/utils/hsdis : hotspot/src/share/tools/hsdis
|
|
||||||
src/utils/reorder : jdk/make/non-build-utils/reorder
|
|
||||||
src/utils/src/build : jdk/make/non-build-utils/src/build
|
|
||||||
make/BuildNashorn.gmk : nashorn/make/BuildNashorn.gmk
|
|
||||||
make/CompileDemos.gmk : jdk/make/CompileDemos.gmk
|
|
||||||
make/CompileInterimLangtools.gmk : langtools/make/CompileInterim.gmk
|
|
||||||
make/CompileModuleTools.gmk : jdk/make/CompileModuleTools.gmk
|
|
||||||
make/CompileToolsHotspot.gmk : hotspot/make/CompileTools.gmk
|
|
||||||
make/CompileToolsJdk.gmk : jdk/make/CompileTools.gmk
|
|
||||||
make/CopyInterimCLDRConverter.gmk : jdk/make/CopyInterimCLDRConverter.gmk
|
|
||||||
make/GenerateModuleSummary.gmk : jdk/make/GenerateModuleSummary.gmk
|
|
||||||
make/ModuleTools.gmk : jdk/make/ModuleTools.gmk
|
|
||||||
make/ToolsJdk.gmk : jdk/make/Tools.gmk
|
|
||||||
make/ToolsLangtools.gmk : langtools/make/Tools.gmk
|
|
||||||
make/UnpackSecurity.gmk : jdk/make/UnpackSecurity.gmk
|
|
||||||
make/autoconf : common/autoconf
|
|
||||||
make/conf : common/conf
|
|
||||||
make/copy : jdk/make/copy
|
|
||||||
make/copy/Copy-java.corba.gmk : corba/make/copy/Copy-java.corba.gmk
|
|
||||||
make/corba : corba/make
|
|
||||||
make/data : jdk/make/data
|
|
||||||
make/gendata : jdk/make/gendata
|
|
||||||
make/gendata/Gendata-jdk.compiler.gmk : langtools/make/gendata/Gendata-jdk.compiler.gmk
|
|
||||||
make/gensrc : jdk/make/gensrc
|
|
||||||
make/gensrc/Gensrc-java.corba.gmk : corba/make/gensrc/Gensrc-java.corba.gmk
|
|
||||||
make/gensrc/Gensrc-jdk.compiler.gmk : langtools/make/gensrc/Gensrc-jdk.compiler.gmk
|
|
||||||
make/gensrc/Gensrc-jdk.hotspot.agent.gmk : hotspot/make/gensrc/Gensrc-jdk.hotspot.agent.gmk
|
|
||||||
make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk : hotspot/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
|
|
||||||
make/gensrc/Gensrc-jdk.javadoc.gmk : langtools/make/gensrc/Gensrc-jdk.javadoc.gmk
|
|
||||||
make/gensrc/Gensrc-jdk.jdeps.gmk : langtools/make/gensrc/Gensrc-jdk.jdeps.gmk
|
|
||||||
make/gensrc/Gensrc-jdk.jshell.gmk : langtools/make/gensrc/Gensrc-jdk.jshell.gmk
|
|
||||||
make/gensrc/GensrcCommonLangtools.gmk : langtools/make/gensrc/GensrcCommon.gmk
|
|
||||||
make/hotspot : hotspot/make
|
|
||||||
make/jdk : jdk/make
|
|
||||||
make/langtools : langtools/make
|
|
||||||
make/launcher : jdk/make/launcher
|
|
||||||
make/lib : jdk/make/lib
|
|
||||||
make/lib/Lib-jdk.hotspot.agent.gmk : hotspot/make/lib/Lib-jdk.hotspot.agent.gmk
|
|
||||||
make/mapfiles : jdk/make/mapfiles
|
|
||||||
make/mapfiles/libjsig : hotspot/make/mapfiles/libjsig
|
|
||||||
make/mapfiles/libjvm_db : hotspot/make/mapfiles/libjvm_db
|
|
||||||
make/mapfiles/libjvm_dtrace : hotspot/make/mapfiles/libjvm_dtrace
|
|
||||||
make/mapfiles/libsaproc : hotspot/make/mapfiles/libsaproc
|
|
||||||
make/nashorn : nashorn/make
|
|
||||||
make/nb_native : common/nb_native
|
|
||||||
make/scripts/addNotices.sh : jdk/make/scripts/addNotices.sh
|
|
||||||
make/scripts/compare.sh : common/bin/compare.sh
|
|
||||||
make/scripts/compare_exceptions.sh.incl : common/bin/compare_exceptions.sh.incl
|
|
||||||
make/scripts/genExceptions.sh : jdk/make/scripts/genExceptions.sh
|
|
||||||
make/scripts/hide_important_warnings_from_javac.sh : common/bin/hide_important_warnings_from_javac.sh
|
|
||||||
make/scripts/logger.sh : common/bin/logger.sh
|
|
||||||
make/src/native/fixpath.c : common/src/fixpath.c
|
|
||||||
make/test/JtregNativeHotspot.gmk : hotspot/make/test/JtregNative.gmk
|
|
||||||
make/test/JtregNativeJdk.gmk : jdk/make/test/JtregNative.gmk
|
|
||||||
test/jdk : jdk/test
|
|
||||||
test/langtools : langtools/test
|
|
||||||
test/nashorn : nashorn/test
|
|
||||||
test/jaxp : jaxp/test
|
|
||||||
test/hotspot/gtest : hotspot/test/native
|
|
||||||
test/hotspot/jtreg : hotspot/test
|
|
||||||
bin : common/bin
|
|
||||||
bin/nashorn : nashorn/bin
|
|
||||||
doc : common/doc
|
|
||||||
doc/nashorn : nashorn/docs
|
|
||||||
@@ -1,237 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
|
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
||||||
#
|
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
|
||||||
# under the terms of the GNU General Public License version 2 only, as
|
|
||||||
# published by the Free Software Foundation.
|
|
||||||
#
|
|
||||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
||||||
# version 2 for more details (a copy is included in the LICENSE file that
|
|
||||||
# accompanied this code).
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License version
|
|
||||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
|
||||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
#
|
|
||||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
||||||
# or visit www.oracle.com if you need additional information or have any
|
|
||||||
# questions.
|
|
||||||
#
|
|
||||||
|
|
||||||
# Script for updating a patch file as per the shuffled/unshuffled source location.
|
|
||||||
|
|
||||||
usage() {
|
|
||||||
echo "Usage: $0 [-h|--help] [-v|--verbose] [-to9|-to10] [-r <repo>] <input_patch> <output_patch>"
|
|
||||||
echo "where:"
|
|
||||||
echo " -to9 create patches appropriate for a JDK 9 source tree"
|
|
||||||
echo " When going to 9, the output patches will be suffixed with the"
|
|
||||||
echo " repo name"
|
|
||||||
echo " -to10 create patches appropriate for a JDK 10 source tree"
|
|
||||||
echo " -r <repo> specify repo for source patch, set to 'top' for top repo"
|
|
||||||
echo " <input_patch> is the input patch file, that needs shuffling/unshuffling"
|
|
||||||
echo " <output_patch> is the updated patch file "
|
|
||||||
echo " "
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
SCRIPT_DIR=`dirname $0`
|
|
||||||
UNSHUFFLE_LIST=$SCRIPT_DIR"/unshuffle_list.txt"
|
|
||||||
|
|
||||||
if [ ! -f "$UNSHUFFLE_LIST" ] ; then
|
|
||||||
echo "FATAL: cannot find $UNSHUFFLE_LIST" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
vflag="false"
|
|
||||||
while [ $# -gt 0 ]
|
|
||||||
do
|
|
||||||
case $1 in
|
|
||||||
-h | --help )
|
|
||||||
usage
|
|
||||||
;;
|
|
||||||
|
|
||||||
-v | --verbose )
|
|
||||||
vflag="true"
|
|
||||||
;;
|
|
||||||
|
|
||||||
-r)
|
|
||||||
repo="$2"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
|
|
||||||
-to9)
|
|
||||||
shuffle_to=9
|
|
||||||
;;
|
|
||||||
|
|
||||||
-to10)
|
|
||||||
shuffle_to=10
|
|
||||||
;;
|
|
||||||
|
|
||||||
-*) # bad option
|
|
||||||
usage
|
|
||||||
;;
|
|
||||||
|
|
||||||
* ) # non option
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
|
|
||||||
# Make sure we have the right number of arguments
|
|
||||||
if [ ! $# -eq 2 ] ; then
|
|
||||||
echo "ERROR: Invalid number of arguments." >&2
|
|
||||||
usage
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check the given repo
|
|
||||||
repos="top corba jaxp jaxws jdk langtools nashorn hotspot"
|
|
||||||
found="false"
|
|
||||||
if [ -n "$repo" ]; then
|
|
||||||
for r in $repos ; do
|
|
||||||
if [ $repo = "$r" ] ; then
|
|
||||||
found="true"
|
|
||||||
break;
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if [ $found = "false" ] ; then
|
|
||||||
echo "ERROR: Unknown repo: $repo. Should be one of [$repos]." >&2
|
|
||||||
usage
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$shuffle_to" != "9" -a "$shuffle_to" != "10" ]; then
|
|
||||||
echo "ERROR: Must pick either -to9 or -to10"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# When going to 10, a repo must be specified for the source patch
|
|
||||||
if [ "$shuffle_to" = "10" -a -z "$repo" ]; then
|
|
||||||
echo "ERROR: Must specify src repo for JDK 9 patch"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check given input/output files
|
|
||||||
input="$1"
|
|
||||||
if [ "x$input" = "x-" ] ; then
|
|
||||||
input="/dev/stdin"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f $input -a "x$input" != "x/dev/stdin" ] ; then
|
|
||||||
echo "ERROR: Cannot find input patch file: $input" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
output="$2"
|
|
||||||
if [ "x$output" = "x-" ] ; then
|
|
||||||
output="/dev/stdout"
|
|
||||||
fi
|
|
||||||
base_output="$output"
|
|
||||||
|
|
||||||
if [ "$shuffle_to" = "10" ]; then
|
|
||||||
if [ -f $output -a "x$output" != "x/dev/stdout" ] ; then
|
|
||||||
echo "ERROR: Output patch already exists: $output" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
for r in $repos; do
|
|
||||||
if [ -f "$output.$r" ]; then
|
|
||||||
echo "ERROR: Output patch already exists: $output.$r" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
verbose() {
|
|
||||||
if [ ${vflag} = "true" ] ; then
|
|
||||||
echo "$@" >&2
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
unshuffle() {
|
|
||||||
line=$@
|
|
||||||
verbose "Attempting to rewrite: \"$line\""
|
|
||||||
|
|
||||||
# Retrieve the file name
|
|
||||||
path=
|
|
||||||
if echo "$line" | egrep '^diff' > /dev/null ; then
|
|
||||||
if ! echo "$line" | egrep '\-\-git' > /dev/null ; then
|
|
||||||
echo "ERROR: Only git patches supported. Please use 'hg export --git ...'." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
path="`echo "$line" | sed -e s@'diff --git a/'@@ -e s@' b/.*$'@@`"
|
|
||||||
elif echo "$line" | egrep '^\-\-\-' > /dev/null ; then
|
|
||||||
path="`echo "$line" | sed -e s@'--- a/'@@`"
|
|
||||||
elif echo "$line" | egrep '^\+\+\+' > /dev/null ; then
|
|
||||||
path="`echo "$line" | sed s@'+++ b/'@@`"
|
|
||||||
fi
|
|
||||||
verbose "Extracted path: \"$path\""
|
|
||||||
|
|
||||||
# Find the most specific matches in the shuffle list
|
|
||||||
matches=
|
|
||||||
if [ -n "$repo" -a "$repo" != "top" ]; then
|
|
||||||
matchpath="$repo"/"$path"/x
|
|
||||||
else
|
|
||||||
matchpath="$path"/x
|
|
||||||
fi
|
|
||||||
while [ "$matchpath" != "" ] ; do
|
|
||||||
matchpath="`echo $matchpath | sed s@'\(.*\)/.*$'@'\1'@`"
|
|
||||||
|
|
||||||
if [ "$shuffle_to" = "10" ] ; then
|
|
||||||
pattern=": $matchpath$"
|
|
||||||
else
|
|
||||||
pattern="^$matchpath :"
|
|
||||||
fi
|
|
||||||
verbose "Attempting to find \"$matchpath\""
|
|
||||||
matches=`egrep "$pattern" "$UNSHUFFLE_LIST"`
|
|
||||||
if ! [ "x${matches}" = "x" ] ; then
|
|
||||||
verbose "Got matches: [$matches]"
|
|
||||||
break;
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! echo "$matchpath" | egrep '.*/.*' > /dev/null ; then
|
|
||||||
break;
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# Rewrite the line, if we have a match
|
|
||||||
if ! [ "x${matches}" = "x" ] ; then
|
|
||||||
shuffled="${matches%% : *}"
|
|
||||||
unshuffled="${matches#* : }"
|
|
||||||
patch_suffix_9=""
|
|
||||||
for r in $repos; do
|
|
||||||
if [ "$unshuffled" != "${unshuffled#$r}" ]; then
|
|
||||||
unshuffled="${unshuffled#$r\/}"
|
|
||||||
patch_suffix_9=".$r"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
verbose "shuffled: $shuffled"
|
|
||||||
verbose "unshuffled: $unshuffled"
|
|
||||||
verbose "patch_suffix_9: $patch_suffix_9"
|
|
||||||
if [ "$shuffle_to" = "10" ] ; then
|
|
||||||
newline="`echo "$line" | sed -e s@"$unshuffled"@"$shuffled"@g`"
|
|
||||||
else
|
|
||||||
newline="`echo "$line" | sed -e s@"$shuffled"@"$unshuffled"@g`"
|
|
||||||
output=$base_output$patch_suffix_9
|
|
||||||
verbose "Writing to $output"
|
|
||||||
fi
|
|
||||||
verbose "Rewriting to \"$newline\""
|
|
||||||
echo "$newline" >> $output
|
|
||||||
else
|
|
||||||
echo "WARNING: no match found for $path"
|
|
||||||
echo "$line" >> $output
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
while IFS= read -r line
|
|
||||||
do
|
|
||||||
if echo "$line" | egrep '^diff|^\-\-\-|^\+\+\+' > /dev/null ; then
|
|
||||||
unshuffle "$line"
|
|
||||||
else
|
|
||||||
printf "%s\n" "$line" >> $output
|
|
||||||
fi
|
|
||||||
done < "$input"
|
|
||||||
@@ -23,9 +23,19 @@
|
|||||||
# The output of this script may require some degree of human curation:
|
# The output of this script may require some degree of human curation:
|
||||||
# - Redundant headers, e.g. both x.hpp, x.inline.hpp are included;
|
# - Redundant headers, e.g. both x.hpp, x.inline.hpp are included;
|
||||||
# - Headers relative to a non-default feature should be protected by an
|
# - Headers relative to a non-default feature should be protected by an
|
||||||
# appropriate 'if' clause to make sure all variants can build without
|
# appropriate 'if' clause to make sure all variants can build without
|
||||||
# errors.
|
# errors.
|
||||||
|
|
||||||
|
source_path="$(dirname ${0})"
|
||||||
|
this_script_dir="$(cd -- "${source_path}" > /dev/null && pwd)"
|
||||||
|
if test -z "${this_script_dir}"; then
|
||||||
|
echo "Error: Could not determine location of this script"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Work in top directory
|
||||||
|
cd $this_script_dir/..
|
||||||
|
|
||||||
# Time threshold for header compilation, if the time exceeds the
|
# Time threshold for header compilation, if the time exceeds the
|
||||||
# threshold the header will be precompiled.
|
# threshold the header will be precompiled.
|
||||||
if [ -z "$MIN_MS" ]; then
|
if [ -z "$MIN_MS" ]; then
|
||||||
@@ -110,4 +110,4 @@ $MV $OUTPUTDIR/compare.log $OUTPUTDIR/compare.log.old 2> /dev/null
|
|||||||
|
|
||||||
export SCRIPT_DIR="$( cd "$( dirname "$0" )" > /dev/null && pwd )"
|
export SCRIPT_DIR="$( cd "$( dirname "$0" )" > /dev/null && pwd )"
|
||||||
|
|
||||||
$BASH $TOPDIR/make/scripts/logger.sh $OUTPUTDIR/compare.log $BASH "$REAL_COMPARE_SCRIPT" "$@"
|
$BASH $TOPDIR/make/scripts/compare-logger.sh $OUTPUTDIR/compare.log $BASH "$REAL_COMPARE_SCRIPT" "$@"
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
|
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
||||||
#
|
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
|
||||||
# under the terms of the GNU General Public License version 2 only, as
|
|
||||||
# published by the Free Software Foundation.
|
|
||||||
#
|
|
||||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
||||||
# version 2 for more details (a copy is included in the LICENSE file that
|
|
||||||
# accompanied this code).
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License version
|
|
||||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
|
||||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
#
|
|
||||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
||||||
# or visit www.oracle.com if you need additional information or have any
|
|
||||||
# questions.
|
|
||||||
#
|
|
||||||
|
|
||||||
GREP=grep
|
|
||||||
|
|
||||||
#
|
|
||||||
EXP="Note: Some input files use or override a deprecated API."
|
|
||||||
EXP="${EXP}|Note: Recompile with -Xlint:deprecation for details."
|
|
||||||
EXP="${EXP}|Note: Some input files use unchecked or unsafe operations."
|
|
||||||
EXP="${EXP}|Note: Recompile with -Xlint:unchecked for details."
|
|
||||||
EXP="${EXP}| warning"
|
|
||||||
EXP="${EXP}|uses or overrides a deprecated API."
|
|
||||||
EXP="${EXP}|uses unchecked or unsafe operations."
|
|
||||||
#
|
|
||||||
${GREP} --line-buffered -v -E "${EXP}"
|
|
||||||
Reference in New Issue
Block a user