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

@@ -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

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=

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

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"

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 <<EOF
+"x86_64-.*-windows-msvc":
+{
+	switches = [
+		"-defaultlib=phobos2-ldc,druntime-ldc",
+		"-link-defaultlib-shared=false",
+	];
+	lib-dirs = [
+		"%%ldcbinarypath%%/../lib-win64",
+	];
+};
+EOF
+	fi
+fi
+# Step 1b: download the LDC x86 windows binaries
+if [ "${ARCH}" == 32 ] && [ ! -d "ldc2-${LDC_VERSION}-windows-x86" ] ; then
+	wget "https://github.com/ldc-developers/ldc/releases/download/v1.13.0/ldc2-${LDC_VERSION}-windows-x86.7z"
+	7z x "ldc2-${LDC_VERSION}-windows-x86.7z" > /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 <<EOF
+"i686-.*-windows-msvc":
+{
+	switches = [
+		"-defaultlib=phobos2-ldc,druntime-ldc",
+		"-link-defaultlib-shared=false",
+	];
+	lib-dirs = [
+		"%%ldcbinarypath%%/../lib-win32",
+	];
+};
+EOF
+	fi
+fi
+
+# set suffices and compilation flags
+if [ "$ARCH" == "64" ] ; then
+	ARCH_SUFFIX="x86_64"
+	export DFLAGS="-mtriple=x86_64-windows-msvc"
+else
+	ARCH_SUFFIX="x86"
+	export DFLAGS="-mtriple=i686-windows-msvc"
+fi
+