summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander M Pickering <alex@cogarr.net>2024-10-08 01:44:29 -0500
committerAlexander M Pickering <alex@cogarr.net>2024-10-08 01:44:29 -0500
commitf34c9eca15529f90e2f7c450b51d36138e178b35 (patch)
tree3728d0595758de6bc6466ef5f4744e27484cbd34
parentadb9d8c609f660b9865c97f937378397ec8c0b14 (diff)
downloadwix-packaging-f34c9eca15529f90e2f7c450b51d36138e178b35.tar.gz
wix-packaging-f34c9eca15529f90e2f7c450b51d36138e178b35.tar.bz2
wix-packaging-f34c9eca15529f90e2f7c450b51d36138e178b35.zip
Don't need the wix repo, actually
We use the prebuilt binaires from the wix repo instead.
-rwxr-xr-xinit4
-rw-r--r--meta.lua1
2 files changed, 3 insertions, 2 deletions
diff --git a/init b/init
index 96b6af3..01c3d34 100755
--- a/init
+++ b/init
@@ -6,11 +6,13 @@ echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositori
6 6
7apk update 7apk update
8apk add automake autoconf libtool build-base mono 8apk add automake autoconf libtool build-base mono
9unzip wix314-binaries.zip 9mkdir wix314-binaries
10unzip wix314-binaries.zip -d wix314-binaries
10cd wix-on-linux 11cd wix-on-linux
11./autogen.sh 12./autogen.sh
12./configure --bindir=/root/wix314-binaries 13./configure --bindir=/root/wix314-binaries
13make 14make
14make install 15make install
15 16
17apk del build-base
16rm -rf /var/cache/apk/* 18rm -rf /var/cache/apk/*
diff --git a/meta.lua b/meta.lua
index 83b9909..f93961c 100644
--- a/meta.lua
+++ b/meta.lua
@@ -1,7 +1,6 @@
1return { 1return {
2 ["image-wix"] = { 2 ["image-wix"] = {
3 requires = { 3 requires = {
4 {"git", "wix#main"},
5 {"git", "wix-on-linux#main"}, 4 {"git", "wix-on-linux#main"},
6 {"http","https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314-binaries.zip"}, 5 {"http","https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314-binaries.zip"},
7 }, 6 },