From 75c2d52632eac5470a48d9b44feb336474a187d8 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 8 Nov 2013 02:40:49 -0500 Subject: [PATCH] more fixes from windows. --- nucleus/tools/clam_tools/cygwin_fixer.cpp | 8 ++++++-- scripts/clam/cpp/rebuild_oldies.sh | 2 +- scripts/core/bootstrap_shells.sh | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nucleus/tools/clam_tools/cygwin_fixer.cpp b/nucleus/tools/clam_tools/cygwin_fixer.cpp index 1295d917..48eba3fe 100644 --- a/nucleus/tools/clam_tools/cygwin_fixer.cpp +++ b/nucleus/tools/clam_tools/cygwin_fixer.cpp @@ -44,13 +44,13 @@ char *translate_cygwin(char *fname) } } - + /* function dossify_and_run_commands() { - + declare -a darc_commands=() for i in "$@"; do // we only mess with the command line on windows. @@ -86,3 +86,7 @@ int main(int argc, char *argv[]) return 0; } +#ifdef __BUILD_STATIC_APPLICATION__ + // static dependencies found by buildor_gen_deps.sh: +#endif // __BUILD_STATIC_APPLICATION__ + diff --git a/scripts/clam/cpp/rebuild_oldies.sh b/scripts/clam/cpp/rebuild_oldies.sh index b502a38d..21a49c29 100755 --- a/scripts/clam/cpp/rebuild_oldies.sh +++ b/scripts/clam/cpp/rebuild_oldies.sh @@ -3,7 +3,7 @@ if [ -f "$BUILD_LIST_FILE" ]; then echo Compiling [$(cat $BUILD_LIST_FILE | while read line; do echo $(basename $line); done )] rm -f $(cat $BUILD_WHACK_FILE) #echo got line to run: $* - eval $* + eval "${@}" rm -f $BUILD_LIST_FILE $BUILD_WHACK_FILE if [ $? -ne 0 ]; then . "$CLAM_DIR/exit_make.sh" diff --git a/scripts/core/bootstrap_shells.sh b/scripts/core/bootstrap_shells.sh index cc13d4ff..227aeb06 100644 --- a/scripts/core/bootstrap_shells.sh +++ b/scripts/core/bootstrap_shells.sh @@ -17,7 +17,7 @@ THIS_TOOL_NAME="$(basename "$0")" pushd "$CORE_SCRIPTS_DIR/../.." &>/dev/null source "$CORE_SCRIPTS_DIR/functions.sh" -export FEISTY_MEOW_DIR="$(unix_to_dos_path $(\pwd) )" +export FEISTY_MEOW_DIR="$(\pwd)" popd &>/dev/null export FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_DIR/scripts" -- 2.34.1