3 Commits

6 changed files with 12 additions and 9 deletions

View File

@@ -1 +1 @@
2.2.1 2.2.2

View File

@@ -1,3 +1,7 @@
## 2.2.2
+ `bootstrap.sh` can show help for cbuild installations again
+ copy dependency out files only if they are newer or don't exist
## 2.2.1 ## 2.2.1
+ updated `bootsrap.sh` to 1.0.2 + updated `bootsrap.sh` to 1.0.2

View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
CBUILD_BOOTSTRAP_VERSION=1.0.2 CBUILD_BOOTSTRAP_VERSION=1.0.3
set -eo pipefail set -eo pipefail
function version_parse { function version_parse {
@@ -75,7 +75,6 @@ do
;; ;;
'-h' | '--help') '-h' | '--help')
print_help print_help
exit 0
;; ;;
'-c' | '--config') '-c' | '--config')
i=$((i+1)) i=$((i+1))

View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
INSTALLED_CBUILD_VERSION=2.2.1 INSTALLED_CBUILD_VERSION=2.2.2
# set \t size to 4 spaces # set \t size to 4 spaces
tabs 4 tabs 4

View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
CBUILD_VERSION=2.2.1 CBUILD_VERSION=2.2.2
PROJECT="%PROJECT_NAME%" PROJECT="%PROJECT_NAME%"
CMP_C="gcc" CMP_C="gcc"

View File

@@ -90,10 +90,10 @@ function build_dependency {
if [ "$PRESERVE_OUT_DIRECTORY_STRUCTURE" = true ] && [ "$file_dir" != '.' ]; then if [ "$PRESERVE_OUT_DIRECTORY_STRUCTURE" = true ] && [ "$file_dir" != '.' ]; then
mkdir -p "$proj_root_dir/$OUTDIR/$file_dir" mkdir -p "$proj_root_dir/$OUTDIR/$file_dir"
mkdir -p "$proj_root_dir/$OBJDIR/dynamic_libs/$file_dir" mkdir -p "$proj_root_dir/$OBJDIR/dynamic_libs/$file_dir"
cp -v "$file" "$proj_root_dir/$OUTDIR/$file" cp -v -u --preserve=timestamps "$file" "$proj_root_dir/$OUTDIR/$file"
ln -sfv "$real_file" "$proj_root_dir/$OBJDIR/dynamic_libs/$file" ln -sfv "$real_file" "$proj_root_dir/$OBJDIR/dynamic_libs/$file"
else else
cp -v "$file" "$proj_root_dir/$OUTDIR/" cp -v -u --preserve=timestamps "$file" "$proj_root_dir/$OUTDIR/"
ln -sfv "$real_file" "$proj_root_dir/$OBJDIR/dynamic_libs/" ln -sfv "$real_file" "$proj_root_dir/$OBJDIR/dynamic_libs/"
fi fi
done done
@@ -104,9 +104,9 @@ function build_dependency {
if [ "$PRESERVE_OUT_DIRECTORY_STRUCTURE" = true ]; then if [ "$PRESERVE_OUT_DIRECTORY_STRUCTURE" = true ]; then
file_dir=$(dirname $file) file_dir=$(dirname $file)
mkdir -p "$proj_root_dir/$OUTDIR/$file_dir" mkdir -p "$proj_root_dir/$OUTDIR/$file_dir"
cp -v "$file" "$proj_root_dir/$OUTDIR/$file" cp -v -u --preserve=timestamps "$file" "$proj_root_dir/$OUTDIR/$file"
else else
cp -v "$file" "$proj_root_dir/$OUTDIR/" cp -v -u --preserve=timestamps "$file" "$proj_root_dir/$OUTDIR/"
fi fi
done done
fi fi