diff options
author | David Timber <mieabby@gmail.com> | 2020-09-28 17:46:33 +0930 |
---|---|---|
committer | David Timber <mieabby@gmail.com> | 2020-09-28 17:46:33 +0930 |
commit | 5dbfcb1f66b681fbb6cdec8836efe2c2d84f957e (patch) | |
tree | ea0412b8e33ee991f83b3832f93852d7d4c5484e /scripts | |
parent | 909e45f775fb5908ab7a4d68eabf9beb91e36ef2 (diff) |
The 80 column rule ...
* Remove prne_rnd_anum_str()
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/build-all.sh | 28 | ||||
-rwxr-xr-x | scripts/build-arch.sh | 25 |
2 files changed, 45 insertions, 8 deletions
diff --git a/scripts/build-all.sh b/scripts/build-all.sh index a9eaeb5..0c6e16f 100755 --- a/scripts/build-all.sh +++ b/scripts/build-all.sh @@ -35,7 +35,9 @@ HOST_ARR=( "sh4-linux" ) ARR_SIZE="${#ARCH_ARR[@]}" -if [ $ARR_SIZE -ne "${#TOOLCHAIN_ARR[@]}" ] || [ $ARR_SIZE -ne "${#HOST_ARR[@]}" ]; then +if [ $ARR_SIZE -ne "${#TOOLCHAIN_ARR[@]}" ] || + [ $ARR_SIZE -ne "${#HOST_ARR[@]}" ]; +then echo "Config error: arrays" >&2 exit 2 fi @@ -64,7 +66,14 @@ PROONE_TOOLS=" rm -rf "$PROONE_PREFIX" -mkdir "$PROONE_PREFIX" "$PROONE_DEBUG_SYM_DIR" "$PROONE_EXEC_DIR" "$PROONE_TOOLS_DIR" "$PROONE_MISC_BIN_DIR" "$PROONE_BINARCH_DIR" "$PROONE_REL_DIR" +mkdir\ + "$PROONE_PREFIX"\ + "$PROONE_DEBUG_SYM_DIR"\ + "$PROONE_EXEC_DIR"\ + "$PROONE_TOOLS_DIR"\ + "$PROONE_MISC_BIN_DIR"\ + "$PROONE_BINARCH_DIR"\ + "$PROONE_REL_DIR" set +e make distclean set -e @@ -79,14 +88,23 @@ cp -a "./src/run-tests.sh" "./src/testlist" "$PROONE_MISC_BIN_DIR" make distclean # generate dvault -"$PROONE_TOOLS_DIR/proone-mkcdict" "./src/proone_conf/cred_dict.txt" "$PROONE_CDICT" +"$PROONE_TOOLS_DIR/proone-mkcdict"\ + "./src/proone_conf/cred_dict.txt"\ + "$PROONE_CDICT" "$PROONE_TOOLS_DIR/proone-mkdvault" "$PROONE_CDICT" > "$PROONE_DVAULT" DVAULT_SIZE=$(stat -c "%s" "$PROONE_DVAULT") # cross-compile targets for (( i = 0; i < ARR_SIZE; i += 1 )); do - PROONE_HOST="${HOST_ARR[$i]}" PROONE_BIN_ARCH="${ARCH_ARR[$i]}" xcomp linux-app "${TOOLCHAIN_ARR[$i]}" "scripts/build-arch.sh" + PROONE_HOST="${HOST_ARR[$i]}"\ + PROONE_BIN_ARCH="${ARCH_ARR[$i]}"\ + xcomp linux-app\ + "${TOOLCHAIN_ARR[$i]}"\ + "scripts/build-arch.sh" done # pack -"$PROONE_TOOLS_DIR/proone-pack" "$PROONE_REL_PREFIX" "$PROONE_DVAULT" "$PROONE_EXEC_PREFIX".* +"$PROONE_TOOLS_DIR/proone-pack"\ + "$PROONE_REL_PREFIX"\ + "$PROONE_DVAULT"\ + "$PROONE_EXEC_PREFIX".* diff --git a/scripts/build-arch.sh b/scripts/build-arch.sh index c326493..bd944e8 100755 --- a/scripts/build-arch.sh +++ b/scripts/build-arch.sh @@ -11,7 +11,20 @@ MISC_BIN=" separate_debug() { cp -a "$1" "$2" "$PROONE_HOST-objcopy" --only-keep-debug "$2" "$3" - "$PROONE_HOST-strip" -S --strip-unneeded --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag --remove-section=.jcr --remove-section=.got.plt --remove-section=.eh_frame --remove-section=.eh_frame_ptr --remove-section=.eh_frame_hdr "$2" + "$PROONE_HOST-strip"\ + -S\ + --strip-unneeded\ + --remove-section=.note.gnu.gold-version\ + --remove-section=.comment\ + --remove-section=.note\ + --remove-section=.note.gnu.build-id\ + --remove-section=.note.ABI-tag\ + --remove-section=.jcr\ + --remove-section=.got.plt\ + --remove-section=.eh_frame\ + --remove-section=.eh_frame_ptr\ + --remove-section=.eh_frame_hdr\ + "$2" "$PROONE_HOST-objcopy" --add-gnu-debuglink="$3" "$2" } @@ -22,9 +35,15 @@ cd src make -j$(nproc) proone.bin $MISC_BIN cd .. -separate_debug src/proone.bin "$BIN_PATH" "$PROONE_DEBUG_SYM_PREFIX""proone.sym.$PROONE_BIN_ARCH" +separate_debug\ + src/proone.bin\ + "$BIN_PATH"\ + "$PROONE_DEBUG_SYM_PREFIX""proone.sym.$PROONE_BIN_ARCH" for b in $MISC_BIN; do - separate_debug "src/$b" "$PROONE_MISC_BIN_PREFIX/$b.$PROONE_BIN_ARCH" "$PROONE_DEBUG_SYM_PREFIX""$b.sym.$PROONE_BIN_ARCH" + separate_debug\ + "src/$b"\ + "$PROONE_MISC_BIN_PREFIX/$b.$PROONE_BIN_ARCH"\ + "$PROONE_DEBUG_SYM_PREFIX""$b.sym.$PROONE_BIN_ARCH" done make distclean |