github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

remove DBG and old code

Browse Source
This commit is contained in:
Tim Hockin 2016-05-05 17:40:19 -07:00
parent 457b27d25f
commit 24f9beb1ff
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hack/update-codecgen.sh
View File

@ -62,34 +62,26 @@ result=""
for (( i=0; i<number; i++ )); do for (( i=0; i<number; i++ )); do
visited[${i}]=false visited[${i}]=false
done done
echo "DBG: found $number generated files" ###echo "DBG: found $number generated files"
for f in $(echo "${generated_files[@]}" | sort); do ###for f in $(echo "${generated_files[@]}" | sort); do
echo "DBG: $f" ### echo "DBG: $f"
done ###done
# NOTE: depends function assumes that the whole repository is under # NOTE: depends function assumes that the whole repository is under
# $my_prefix - it will NOT work if that is not true. # $my_prefix - it will NOT work if that is not true.
function depends { function depends {
file="${generated_files[$1]/\.generated\.go/.go}" file="${generated_files[$1]/\.generated\.go/.go}"
rhs="$(dirname ${generated_files[$2]/#./${my_prefix}})" rhs="$(dirname ${generated_files[$2]/#./${my_prefix}})"
echo "DBG: does ${file} depend on ${rhs}?" ###echo "DBG: does ${file} depend on ${rhs}?"
deps=$(go list -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' ${file} | grep "^${my_prefix}") deps=$(go list -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' ${file} | grep "^${my_prefix}")
candidate=$(readlinkdashf "${generated_files[$2]/\.generated\.go/.go}")
for dep in ${deps}; do for dep in ${deps}; do
echo "DBG: checking against $dep" ###echo "DBG: checking against $dep"
# Only look at dependencies within the kubernetes tree-- otherwise the "io"
# package matches the end of one of our directories.
if [[ ${dep} = "k8s.io"* ]]; then
if [[ ${candidate} = *${dep} ]]; then
echo "DBG: old logic said yes"
fi
fi
if [[ "${dep}" == "${rhs}" ]]; then if [[ "${dep}" == "${rhs}" ]]; then
echo "DBG: = yes" ###echo "DBG: = yes"
return 0 return 0
fi fi
done done
echo "DBG: = no" ###echo "DBG: = no"
return 1 return 1
} }
@ -105,10 +97,11 @@ function tsort {
done done
result="${result} $1" result="${result} $1"
} }
echo "Building dependencies"
for (( i=0; i<number; i++ )); do for (( i=0; i<number; i++ )); do
echo "DBG: considering ${generated_files[${i}]}" ###echo "DBG: considering ${generated_files[${i}]}"
if ! ${visited[${i}]}; then if ! ${visited[${i}]}; then
echo "DBG: tsorting ${generated_files[${i}]}" ###echo "DBG: tsorting ${generated_files[${i}]}"
tsort ${i} tsort ${i}
fi fi
done done
@ -122,6 +115,7 @@ if [[ -z ${haveindex} ]]; then
exit 1 exit 1
fi fi
echo "Building codecgen"
CODECGEN="${PWD}/codecgen_binary" CODECGEN="${PWD}/codecgen_binary"
godep go build -o "${CODECGEN}" github.com/ugorji/go/codec/codecgen godep go build -o "${CODECGEN}" github.com/ugorji/go/codec/codecgen
@ -146,7 +140,7 @@ for current in "${index[@]}"; do
base_generated_file=$(basename "${generated_file}") base_generated_file=$(basename "${generated_file}")
# We use '-d 1234' flag to have a deterministic output every time. # We use '-d 1234' flag to have a deterministic output every time.
# The constant was just randomly chosen. # The constant was just randomly chosen.
echo "DBG: running ${CODECGEN} -d 1234 -o ${base_generated_file} ${base_file}" ###echo "DBG: running ${CODECGEN} -d 1234 -o ${base_generated_file} ${base_file}"
${CODECGEN} -d 1234 -o "${base_generated_file}" "${base_file}" ${CODECGEN} -d 1234 -o "${base_generated_file}" "${base_file}"
# Add boilerplate at the beginning of the generated file. # Add boilerplate at the beginning of the generated file.
sed 's/YEAR/2015/' "${initial_dir}/hack/boilerplate/boilerplate.go.txt" > "${base_generated_file}.tmp" sed 's/YEAR/2015/' "${initial_dir}/hack/boilerplate/boilerplate.go.txt" > "${base_generated_file}.tmp"