From e8180d64a6572b3a879a2c5348ca5254be15063f Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Thu, 18 Apr 2019 02:36:21 +0200 Subject: [PATCH] Use LDC for cross-compilation Win{32,64} binaries (#743) * Build win64 binaries * Allow adding DFLAGS * bump ldc to 1.13 * Download & install the same LDC version * Build win64 binaries in a separate job * Fix release-windows for ARCH=64 * Re-enable ldc-beta * Add more comments * Use the LDC release build * Remove note about requiring wine * Split-up LDC setup in a separate file --- .travis.yml | 25 +++++++++++++--- build.bat | 2 +- makefile | 3 ++ release-windows.sh | 23 ++++++--------- setup-ldc-windows.sh | 70 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 104 insertions(+), 19 deletions(-) create mode 100644 setup-ldc-windows.sh diff --git a/.travis.yml b/.travis.yml index 3b7bed0..ef557f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ jobs: include: - stage: GitHub Release #if: tag IS present - d: ldc-1.8.0 + d: ldc-1.13.0 os: linux script: echo "Deploying to GitHub releases ..." && ./release.sh deploy: @@ -34,7 +34,7 @@ jobs: tags: true - stage: GitHub Release #if: tag IS present - d: ldc-1.8.0 + d: ldc-1.13.0 os: osx script: echo "Deploying to GitHub releases ..." && ./release.sh deploy: @@ -51,13 +51,30 @@ jobs: d: dmd os: linux language: generic - sudo: yes script: echo "Deploying to GitHub releases ..." && ./release-windows.sh addons: apt: packages: - p7zip-full - - wine + deploy: + provider: releases + api_key: $GH_REPO_TOKEN + file_glob: true + file: bin/dscanner-*.zip + skip_cleanup: true + on: + repo: dlang-community/D-Scanner + tags: true + - stage: GitHub Release + #if: tag IS present + d: dmd + os: linux + language: generic + script: echo "Deploying to GitHub releases ..." && ARCH=64 ./release-windows.sh + addons: + apt: + packages: + - p7zip-full deploy: provider: releases api_key: $GH_REPO_TOKEN diff --git a/build.bat b/build.bat index 62ae845..fc95181 100644 --- a/build.bat +++ b/build.bat @@ -18,7 +18,7 @@ if %githashsize% == 0 ( move /y bin\githash_.txt bin\githash.txt ) -set DFLAGS=-O -release -inline -version=StdLoggerDisableWarning -Jbin +set DFLAGS=-O -release -version=StdLoggerDisableWarning -Jbin %MFLAGS% set TESTFLAGS=-g -w -version=StdLoggerDisableWarning set CORE= set LIBDPARSE= diff --git a/makefile b/makefile index 9f1cb4a..533d660 100644 --- a/makefile +++ b/makefile @@ -26,6 +26,9 @@ INCLUDE_PATHS = \ VERSIONS = DEBUG_VERSIONS = -version=dparse_verbose DMD_FLAGS = -w -release -O -Jbin -od${OBJ_DIR} -version=StdLoggerDisableWarning +override DMD_FLAGS += $(DFLAGS) +override LDC_FLAGS += $(DFLAGS) +override GDC_FLAGS += $(DFLAGS) DMD_TEST_FLAGS = -w -g -Jbin -version=StdLoggerDisableWarning override LDC_FLAGS += -O5 -release -oq -d-version=StdLoggerDisableWarning override GDC_FLAGS += -O3 -frelease -d-version=StdLoggerDisableWarning diff --git a/release-windows.sh b/release-windows.sh index cbb7b91..e8f0bfc 100755 --- a/release-windows.sh +++ b/release-windows.sh @@ -1,26 +1,21 @@ #!/usr/bin/env bash -# Build the Windows binaries under Linux (requires wine) +# Build the Windows binaries under Linux set -eux -o pipefail -VERSION=$(git describe --abbrev=0 --tags) -OS=windows -ARCH_SUFFIX="x86" + +BIN_NAME=dscanner # Allow the script to be run from anywhere DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR -# Step 1: download the DMD binaries -if [ ! -d dmd2 ] ; then - wget http://downloads.dlang.org/releases/2.x/2.079.0/dmd.2.079.0.windows.7z - 7z x dmd.2.079.0.windows.7z > /dev/null -fi +source setup-ldc-windows.sh -# Step 2: Run DMD via wineconsole -archiveName="dscanner-$VERSION-$OS-$ARCH_SUFFIX.zip" +# Run LDC with cross-compilation +archiveName="$BIN_NAME-$VERSION-$OS-$ARCH_SUFFIX.zip" echo "Building $archiveName" mkdir -p bin -git describe --tags > bin/githash.txt # no git installed under Wine -DC="$DIR/dmd2/windows/bin/dmd.exe" wine cmd /C build.bat +DC=ldmd2 make ldcbuild cd bin -zip "$archiveName" dscanner.exe +mv "${BIN_NAME}" "${BIN_NAME}.exe" +zip "$archiveName" "${BIN_NAME}.exe" diff --git a/setup-ldc-windows.sh b/setup-ldc-windows.sh new file mode 100644 index 0000000..0656b5a --- /dev/null +++ b/setup-ldc-windows.sh @@ -0,0 +1,70 @@ +#!/usr/bin/env bash + +# sets up LDC for cross-compilation. Source this script, s.t. the new LDC is in PATH + +LDC_VERSION="1.13.0" +ARCH=${ARCH:-32} +VERSION=$(git describe --abbrev=0 --tags) +OS=windows + +# Step 0: install ldc +if [ ! -f install.sh ] ; then + wget https://dlang.org/install.sh +fi +. $(bash ./install.sh -a "ldc-${LDC_VERSION}") + +# for the install.sh script only +LDC_PATH="$(dirname $(dirname $(which ldc2)))" + +# Step 1a: download the LDC x64 windows binaries +if [ "${ARCH}" == 64 ] && [ ! -d "ldc2-${LDC_VERSION}-windows-x64" ] ; then + wget "https://github.com/ldc-developers/ldc/releases/download/v1.13.0/ldc2-${LDC_VERSION}-windows-x64.7z" + 7z x "ldc2-${LDC_VERSION}-windows-x64.7z" > /dev/null + # Step 2a: Add LDC windows binaries to LDC Linux + if [ ! -d "${LDC_PATH}/lib-win64" ] ; then + cp -r ldc2-1.13.0-windows-x64/lib "${LDC_PATH}/lib-win64" + cat >> "$LDC_PATH"/etc/ldc2.conf < /dev/null + # Step 2b: Add LDC windows binaries to LDC Linux + if [ ! -d "${LDC_PATH}/lib-win32" ] ; then + cp -r ldc2-1.13.0-windows-x86/lib "${LDC_PATH}/lib-win32" + cat >> "$LDC_PATH"/etc/ldc2.conf <