Skip to content

Remove hard-coded src/dmd executables #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
braddr merged 1 commit into from
Dec 5, 2017
Merged

Remove hard-coded src/dmd executables #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/do_build_druntime.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if [ $? -ne 0 ]; then
fi

if [ "$2" != "Win_32" -a "$2" != "Win_32_64" ]; then
$makecmd DMD=../dmd/src/dmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile install >> ../druntime-build.log 2>&1
$makecmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile install >> ../druntime-build.log 2>&1
if [ $? -ne 0 ]; then
echo -e "\tfailed to install $repo"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion src/do_build_phobos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if [ $? -ne 0 ]; then
fi

if [ "$2" != "Win_32" -a "$2" != "Win_32_64" ]; then
$makecmd DMD=../dmd/src/dmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile install >> ../phobos-build.log 2>&1
$makecmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile install >> ../phobos-build.log 2>&1
if [ $? -ne 0 ]; then
echo -e "\tfailed to install $repo"
exit 1
Expand Down
3 changes: 1 addition & 2 deletions src/do_html_phobos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ echo -e "\tgenerating html"

cd $1/phobos

DMD=../dmd/src/dmd
DOC=../web/2.0

if [ "${2:0:4}" == "Win_" ]; then
Expand All @@ -23,7 +22,7 @@ else
DD=WEBSITE_DIR
fi

$makecmd DDOC=$DMD $DD=$DOC DMD=$DMD MODEL=$OUTPUT_MODEL -f $makefile html >> ../phobos-html.log 2>&1
$makecmd DDOC=$DMD $DD=$DOC MODEL=$OUTPUT_MODEL -f $makefile html >> ../phobos-html.log 2>&1
if [ $? -ne 0 ]; then
echo -e "\tphobos html generation failed"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion src/do_test_druntime.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if [ "$2" == "stub" ]; then
exit 0
fi

$makecmd DMD=../dmd/src/dmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile auto-tester-test >> ../druntime-unittest.log 2>&1
$makecmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile auto-tester-test >> ../druntime-unittest.log 2>&1
if [ $? -ne 0 ]; then
echo -e "\tdruntime unittest failed to build"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion src/do_test_phobos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ case "$2" in
;;
esac

$makecmd DMD=../dmd/src/dmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile auto-tester-test >> ../phobos-unittest.log 2>&1
$makecmd MODEL=$OUTPUT_MODEL $EXTRA_ARGS -f $makefile auto-tester-test >> ../phobos-unittest.log 2>&1
if [ $? -ne 0 ]; then
echo -e "\tphobos tests failed"
exit 1
Expand Down