mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modify the bash scripts to handle the new folder structure

Browse source
This commit is contained in:
Livar Cunha 2016-01-20 15:09:25 -08:00
parent ac2d0e36a9
commit 0c3751cd37
3 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/compile/compile-stage.sh
View file

@ -56,6 +56,8 @@ FILES_TO_CLEAN=( \
)
RUNTIME_OUTPUT_DIR="$OUTPUT_DIR/runtime/coreclr"
BINARIES_OUTPUT_DIR="$OUTPUT_DIR/bin/$CONFIGURATION/$TFM"
RUNTIME_BINARIES_OUTPUT_DIR="$RUNTIME_OUTPUT_DIR/$CONFIGURATION/$TFM"
for project in ${PROJECTS[@]}
do
@ -63,9 +65,21 @@ do
dotnet publish --native-subdirectory --framework "$TFM" --output "$OUTPUT_DIR/bin" --configuration "$CONFIGURATION" "$REPOROOT/src/$project"
done
if [ -d "$BINARIES_OUTPUT_DIR" ]
then
cp -R -f $BINARIES_OUTPUT_DIR/* $OUTPUT_DIR/bin
fi
rm -rf $OUTPUT_DIR/bin/$CONFIGURATION
# Bring in the runtime
dotnet publish --output "$RUNTIME_OUTPUT_DIR" --configuration "$CONFIGURATION" "$REPOROOT/src/Microsoft.DotNet.Runtime"
if [ -d "$RUNTIME_BINARIES_OUTPUT_DIR" ]
then
cp -R -f $RUNTIME_BINARIES_OUTPUT_DIR/* $RUNTIME_OUTPUT_DIR
fi
rm -rf "$RUNTIME_OUTPUT_DIR/$CONFIGURATION"
# Clean up bogus additional files
for file in ${FILES_TO_CLEAN[@]}
do

6
scripts/test/runtests.sh
View file

@ -32,6 +32,12 @@ do
dotnet publish --framework "dnxcore50" --output "$TestBinRoot" --configuration "$CONFIGURATION" "$REPOROOT/test/$project"
done
if [ -d "$TestBinRoot/$CONFIGURATION/dnxcore50" ]
then
cp -R -f $TestBinRoot/$CONFIGURATION/dnxcore50/* $TestBinRoot
fi
rm -rf $TestBinRoot/$CONFIGURATION/dnxcore50
# copy TestProjects folder which is used by the test cases
mkdir -p "$TestBinRoot/TestProjects"
cp -a $REPOROOT/test/TestProjects/* $TestBinRoot/TestProjects

8
scripts/test/validate-dependencies.sh
View file

@ -20,5 +20,11 @@ source "$DIR/../common/_common.sh"
dotnet publish "$REPOROOT/tools/MultiProjectValidator" -o "$STAGE2_DIR/../tools"
#TODO for release builds this should fail
set +e
"$STAGE2_DIR/../tools/pjvalidate" "$REPOROOT/src"
PJ_VALIDATE_PATH = "$STAGE2_DIR/../tools/$CONFIGURATION/$TFM"
if [ ! -d "$PJ_VALIDATE_PATH" ]
then
PJ_VALIDATE_PATH = "$STAGE2_DIR/../tools"
fi
"$PJ_VALIDATE_PATH/pjvalidate" "$REPOROOT/src"
set -e