Commit 28e4ed82 authored by Eric Timmons's avatar Eric Timmons
Browse files

Windows build fixes

parent 755933c3
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
:context context) :context context)
(let ((cid (uiop:read-file-string cid-pn))) (let ((cid (uiop:read-file-string cid-pn)))
(if (equal (second tuple) "windows") (if (equal (second tuple) "windows")
(docker-cp cid #?"/clpm-${(git-tag ref)}/build/clpm.msi" (docker-cp cid #?"C:/clpm-${(git-tag ref)}/build/clpm.msi"
(namestring (merge-pathnames (format nil "clpm-~{~A~^-~}-~A.msi" tuple (git-tag)) (namestring (merge-pathnames (format nil "clpm-~{~A~^-~}-~A.msi" tuple (git-tag))
output-dir)) output-dir))
:context context) :context context)
......
...@@ -18,6 +18,8 @@ RUN $chocourl = 'https://chocolatey.org/install.ps1'; \ ...@@ -18,6 +18,8 @@ RUN $chocourl = 'https://chocolatey.org/install.ps1'; \
# Install git so that we can determine release version. # Install git so that we can determine release version.
RUN choco install -y git; RUN choco install -y git;
RUN git config --global core.autocrlf false;
# Install WIX. We don't install it through chocolatey because dotnet35 seems to # Install WIX. We don't install it through chocolatey because dotnet35 seems to
# be broken in chocolatey # be broken in chocolatey
RUN Write-Host "Starting download"; \ RUN Write-Host "Starting download"; \
...@@ -28,9 +30,24 @@ RUN Write-Host "Starting download"; \ ...@@ -28,9 +30,24 @@ RUN Write-Host "Starting download"; \
cd wix/bin; \ cd wix/bin; \
unzip ../../wix311-binaries.zip; unzip ../../wix311-binaries.zip;
WORKDIR C:/clpm WORKDIR C:/
COPY . C:/clpm COPY .git C:/clpm-git
# This is the git ref we bvuild from.
ARG ref=master
# This is the "tag" (output from git describe)
ARG describe
RUN git clone C:/clpm-git C:/clpm-$Env:describe
WORKDIR C:/clpm-$describe
RUN git checkout $Env:ref; \
git submodule init; \
git submodule update;
RUN sbcl --disable-debugger --load scripts/build.lisp --quit; \
sbcl --disable-debugger --load scripts/build-wxs.lisp --quit;
WORKDIR C:/clpm-$describe/build
RUN sbcl --load scripts/build.lisp; \ RUN ls; C:\wix\bin\candle clpm.wxs; \
C:\wix\bin\candle clpm.wxs; \ C:\wix\bin\light clpm.wixobj -ext C:\wix\bin\WixUIExtension.dll -cultures:en-us -out clpm.msi;
C:\wix\bin\light clpm.wixobj -ext C:\wix\bin\WixUIExtension.dll -cultures:en-us -out build\clpm.msi;
...@@ -111,7 +111,8 @@ ...@@ -111,7 +111,8 @@
"Guid" "35C91C7A-ED22-40B5-A761-730C57CCF803" "Guid" "35C91C7A-ED22-40B5-A761-730C57CCF803"
"DiskId" "1" "DiskId" "1"
"Win64" "yes") "Win64" "yes")
(("CreateFolder"))) (("CreateFolder"))
,@(directory-files (merge-pathnames "lib/clpm/" *build-root-pathname*)))
(("Component" "Id" "CLPM_SetHOME" (("Component" "Id" "CLPM_SetHOME"
"Guid" "E75E9C41-C6B9-44FE-90B3-8055B22341D0" "Guid" "E75E9C41-C6B9-44FE-90B3-8055B22341D0"
"DiskId" "1" "DiskId" "1"
...@@ -123,20 +124,21 @@ ...@@ -123,20 +124,21 @@
"Name" "CLPM_HOME" "Name" "CLPM_HOME"
"Part" "all" "Part" "all"
"Value" "[LIBDIR]"))) "Value" "[LIBDIR]")))
(("Component" "Id" "LibFiles"
"Guid" "FABDC0CC-CFE3-479D-914D-4EB739D8C513")
,@(directory-files (merge-pathnames "lib/clpm/" *build-root-pathname*)))
(("Directory" "Id" "SrcDir" (("Directory" "Id" "SrcDir"
"Name" "src") "Name" "src")
(("Directory" "Id" "ClientDir" (("Directory" "Id" "ClientDir"
"Name" "clpm-client") "Name" "clpm-client")
(("Component" "Id" "CLPM_Client" (("Component" "Id" "CLPM_Client"
"Guid" "6B847710-C813-4E8E-861B-7C0B767F4C36") "Guid" "6B847710-C813-4E8E-861B-7C0B767F4C36"
"DiskId" "1"
"Win64" "yes")
,@(directory-files (merge-pathnames "lib/clpm/src/clpm-client/" *build-root-pathname*)))) ,@(directory-files (merge-pathnames "lib/clpm/src/clpm-client/" *build-root-pathname*))))
(("Directory" "Id" "GrovelerDir" (("Directory" "Id" "GrovelerDir"
"Name" "clpm-groveler") "Name" "clpm-groveler")
(("Component" "Id" "CLPM_Groveler" (("Component" "Id" "CLPM_Groveler"
"Guid" "639DDC25-7C6D-4F7B-809E-A7989A3D15BE") "Guid" "639DDC25-7C6D-4F7B-809E-A7989A3D15BE"
"DiskId" "1"
"Win64" "yes")
,@(directory-files (merge-pathnames "lib/clpm/src/clpm-groveler/" *build-root-pathname*))))))))))) ,@(directory-files (merge-pathnames "lib/clpm/src/clpm-groveler/" *build-root-pathname*)))))))))))
(("Feature" "Id" "Minimal" (("Feature" "Id" "Minimal"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment