diff --git a/.travis.yml b/.travis.yml index a65e3e9..e337231 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,7 @@ - d: gdc-4.8.5 env: [FRONTEND=2.068] - stage: deploy - d: dmd + d: ldc os: osx script: echo "Deploying to GitHub releases ..." && ./release.sh deploy: @@ -69,9 +69,8 @@ api_key: $GH_REPO_TOKEN on: tags: true - - d: dmd - # DMD 32-bit is needed for 32-bit compilation - script: echo "Deploying to GitHub releases ..." && DMD=$(find $HOME/dlang | grep "dmd-.*/linux/bin32/dmd") ./release.sh + - d: ldc + script: echo "Deploying to GitHub releases ..." && ./release.sh env: [ARCH=32] addons: apt: @@ -86,7 +85,7 @@ api_key: $GH_REPO_TOKEN on: tags: true - - d: dmd + - d: ldc script: echo "Deploying to GitHub releases ..." && ./release.sh deploy: - provider: releases diff --git a/build.sh b/build.sh index 17bc08b..3b2f527 100755 --- a/build.sh +++ b/build.sh @@ -56,7 +56,7 @@ MACOSX_DEPLOYMENT_TARGET=10.7 echo Running $DMD... -$DMD -ofbin/dub -L--export-dynamic -g -O -w -version=DubUseCurl -Isource $* $LIBS @build-files.txt +$DMD -ofbin/dub -g -O -w -version=DubUseCurl -Isource $* $LIBS @build-files.txt bin/dub --version echo DUB has been built as bin/dub. echo diff --git a/release.sh b/release.sh index e889a30..ceec952 100755 --- a/release.sh +++ b/release.sh @@ -4,11 +4,17 @@ VERSION=$(git describe --abbrev=0 --tags) ARCH="${ARCH:-64}" +CUSTOM_FLAGS="" unameOut="$(uname -s)" case "$unameOut" in - Linux*) OS=linux; ;; - Darwin*) OS=osx; ;; + Linux*) + OS=linux + CUSTOM_FLAGS="-L--export-dynamic" + ;; + Darwin*) + OS=osx + ;; *) echo "Unknown OS: $unameOut"; exit 1 esac @@ -21,5 +27,5 @@ archiveName="dub-$VERSION-$OS-$ARCH_SUFFIX.tar.gz" echo "Building $archiveName" -DFLAGS="-release -m$ARCH" DMD="$(command -v $DMD)" ./build.sh +DFLAGS="-release -m$ARCH ${CUSTOM_FLAGS}" DMD="$(command -v $DMD)" ./build.sh tar cvfz "bin/$archiveName" -C bin dub