From 7115f60b91b5717d90f643fd692010905c7004db Mon Sep 17 00:00:00 2001 From: Bryan Galdrikian Date: Thu, 31 May 2018 11:36:08 -0700 Subject: Blast 1.1.3. See docs/release_notes.txt. --- generate_projects_linux.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'generate_projects_linux.sh') diff --git a/generate_projects_linux.sh b/generate_projects_linux.sh index ba4344c..ebbc58d 100755 --- a/generate_projects_linux.sh +++ b/generate_projects_linux.sh @@ -1,11 +1,13 @@ -#!/bin/sh +x +#!/bin/bash +x # Set the blast root to the current directory SCRIPT=$(readlink -f "$0") export BLAST_ROOT_DIR=$(dirname $SCRIPT) echo $BLAST_ROOT_DIR -# Run packman to ensure dependencies are present and run cmake generation script afterwards -echo "Running packman in preparation for cmake ..." +# Run packman to ensure dependencies are present and run cmake generation script last +echo "Getting build platform dependencies for Linux ..." +source $BLAST_ROOT_DIR"/buildtools/packman5/packman" pull $BLAST_ROOT_DIR"/buildtools/build_platform_deps.xml" --platform linux -$BLAST_ROOT_DIR"/buildtools/packman/packman" pull $BLAST_ROOT_DIR"/dependencies.xml" --platform linux --postscript $BLAST_ROOT_DIR"/buildtools/cmake_projects_linux.sh" +echo "Getting target platform dependencies for Linux ..." +source $BLAST_ROOT_DIR"/buildtools/packman5/packman" pull $BLAST_ROOT_DIR"/target_platform_deps.xml" --platform linux --postscript $BLAST_ROOT_DIR"/buildtools/cmake_projects_linux.sh" -- cgit v1.2.3