Skip to content

Commit 0d84fd5

Browse files
author
Halim Amer
committed
release: updated the bolt-release.pl script
This update is to reflect the dropped CMakeLists.txt creation and the new submodule integration of Argobots. Signed-off-by: Shintaro Iwasaki <[email protected]>
1 parent 0404b9b commit 0d84fd5

File tree

1 file changed

+3
-17
lines changed

1 file changed

+3
-17
lines changed

maint/bolt-release.pl

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -107,20 +107,13 @@ sub run_cmd
107107

108108
# clone git repo
109109
print("===> Cloning git repo... ");
110-
run_cmd("git clone -b ${branch} ${git_repo} ${local_git_clone}");
110+
run_cmd("git clone --recursive -b ${branch} ${git_repo} ${local_git_clone}");
111111
print("done\n");
112112

113113
# chdirs to $local_git_clone if valid
114114
check_git_repo($local_git_clone);
115115
print("\n");
116116

117-
my $current_ver = `git show ${branch}:autogen.sh | grep BOLT_VERSION= | \
118-
sed -e 's/^BOLT_VERSION=\\(.*\\)/\\1/g'`;
119-
chomp $current_ver;
120-
if ("$current_ver" ne "$version") {
121-
print("\tWARNING: version in autogen.sh ($current_ver) does not match user version ($version)\n\n");
122-
}
123-
124117
if ($append_commit_id) {
125118
my $desc = `git describe --always ${branch}`;
126119
chomp $desc;
@@ -137,21 +130,14 @@ sub run_cmd
137130
run_cmd("rm -rf ${expdir}");
138131
run_cmd("mkdir -p ${expdir}");
139132
run_cmd("git archive ${branch} --prefix='bolt-${version}/' | tar -x -C $tdir");
140-
print("done\n");
141-
142-
# Create CMakeLists.txt
143-
print("===> Creating CMakeLists.txt in the main codebase... ");
144-
chdir($expdir);
145-
{
146-
my $cmd = "./autogen.sh -r";
147-
run_cmd($cmd);
148-
}
133+
run_cmd("git submodule foreach --recursive \'git archive HEAD --prefix='' | tar -x -C `echo \${toplevel}/\${path} | sed -e s/clone/${version}/`'");
149134
print("done\n");
150135

151136
# Remove unnecessary files
152137
print("===> Removing unnecessary files in the main codebase... ");
153138
chdir($expdir);
154139
run_cmd("find . -name .gitignore | xargs rm -rf");
140+
run_cmd("find . -name .gitmodules | xargs rm -rf");
155141
run_cmd("find . -name .tmp | xargs rm -rf");
156142
print("done\n");
157143

0 commit comments

Comments
 (0)