Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
24f9beb1
Commit
24f9beb1
authored
May 05, 2016
by
Tim Hockin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove DBG and old code
parent
457b27d2
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
19 deletions
+13
-19
update-codecgen.sh
hack/update-codecgen.sh
+13
-19
No files found.
hack/update-codecgen.sh
View file @
24f9beb1
...
@@ -62,34 +62,26 @@ result=""
...
@@ -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 {
...
@@ -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
...
@@ -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
...
@@ -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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment