Skip to content

Commit 0ac87ab

Browse files
committed
Move the files to be deleted in lib dir to an external file just like
for the other dirs.
1 parent c72e3af commit 0ac87ab

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

config/slim-java_lib_del.list

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# Licensed under the Apache License, Version 2.0 (the "License");
3+
# you may not use this file except in compliance with the License.
4+
# You may obtain a copy of the License at
5+
#
6+
# http://www.apache.org/licenses/LICENSE-2.0
7+
#
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
#
14+
ct.sym
15+
jexec
16+
tools.jar

slim-java.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ del_list="${scriptdir}/slim-java_rtjar_del.list"
4545
del_jmod_list="${scriptdir}/slim-java_jmod_del.list"
4646
# bin files to be deleted
4747
del_bin_list="${scriptdir}/slim-java_bin_del.list"
48+
# lib files to be deleted
49+
del_lib_list="${scriptdir}/slim-java_lib_del.list"
4850

4951
# We only support 64 bit builds now
5052
proc_type="64bit"
@@ -250,9 +252,10 @@ function bin_files() {
250252
function lib_files() {
251253
echo -n "INFO: Trimming bin dir..."
252254
pushd ${target}/lib >/dev/null
253-
rm -f ct.sym
254-
rm -f jexec
255-
rm -f tools.jar
255+
for binfile in $(cat ${del_lib_list} | grep -v "^#");
256+
do
257+
rm -rf ${binfile}
258+
done
256259
popd >/dev/null
257260
}
258261

0 commit comments

Comments
 (0)