Skip to content

Commit 964fc28

Browse files
committed
Merge remote-tracking branch 'origin/master'
Conflicts: windows/bg.bmp windows/blank.bmp windows/redhat.bmp
2 parents 431c94f + 5e7f41d commit 964fc28

12 files changed

Lines changed: 62 additions & 1 deletion

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
Output/
1+
windows/Output/
2+
dist/

Dockerfile.windows

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
FROM debian:jessie
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
5+
RUN dpkg --add-architecture i386
6+
RUN sed -i "s/main/main contrib non-free/" etc/apt/sources.list
7+
RUN apt-get update && apt-get install -yq wine curl unrar unzip
8+
9+
# innosetup
10+
RUN mkdir innosetup && \
11+
cd innosetup && \
12+
curl -fsSL -o innounp043.rar "https://downloads.sourceforge.net/project/innounp/innounp/innounp%200.43/innounp043.rar?r=&ts=1439566551&use_mirror=skylineservers" && \
13+
unrar e innounp043.rar
14+
15+
RUN cd innosetup && \
16+
curl -fsSL -o is-unicode.exe http://www.jrsoftware.org/download.php/is-unicode.exe && \
17+
wine "./innounp.exe" -e "is-unicode.exe"
18+
19+
# inno download plugin
20+
COPY build /build
21+
RUN mkdir innodownload && \
22+
cd build && \
23+
wine "../innosetup/innounp.exe" -x -d"../innodownload" "../build/idpsetup-1.5.0.exe" && \
24+
cp -a "../innodownload/{app}"/. ../innodownload/
25+
26+
RUN cd innosetup && \
27+
sed -i '$ a ; Inno Download Plugin include path' ISPPBuiltins.iss && \
28+
sed -i '$ a #pragma include __INCLUDE__ + ";" + "../innodownload"' ISPPBuiltins.iss
29+
30+
# installer components
31+
ENV INSTALLER_VERSION 0.0.1
32+
33+
# Add installer resources
34+
COPY windows /installer
35+
36+
WORKDIR /installer
37+
RUN rm -rf /tmp/.wine-0/
38+
RUN wine ../innosetup/ISCC.exe developer_platform_installer.iss /DMyAppVersion=$INSTALLER_VERSION

Makefile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
DOCKER_WINDOWS_IMAGE := windows-installer
2+
DOCKER_WINDOWS_CONTAINER := build-windows
3+
4+
default: windows
5+
@true
6+
7+
windows: clean-windows
8+
docker build -t $(DOCKER_WINDOWS_IMAGE) -f Dockerfile.windows .
9+
docker run --name "$(DOCKER_WINDOWS_CONTAINER)" "$(DOCKER_WINDOWS_IMAGE)"
10+
mkdir -p dist
11+
docker cp "$(DOCKER_WINDOWS_CONTAINER)":/installer/Output/developer_platform.exe dist/
12+
docker rm "$(DOCKER_WINDOWS_CONTAINER)" 2>/dev/null || true
13+
14+
clean-windows:
15+
rm -f developer_platform.exe
16+
docker rm "$(DOCKER_WINDOWS_CONTAINER)" 2>/dev/null || true

Output/Zulu OpenJDK

71.5 MB
Binary file not shown.

Output/developer_platform.exe

383 KB
Binary file not shown.

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,11 @@ After installing both Inno Setup and the Inno Download Plugin, launch the Inno S
1010

1111
Ctrl+F9 will compile the installer, while F9 will compile and run the installer.
1212

13+
Building on Linux
14+
-----------------
1315

16+
```
17+
make
18+
```
1419

20+
The resulting installer will be in the `dist` directory.

build/idpsetup-1.5.0.exe

585 KB
Binary file not shown.

windows/bg.bmp

66.1 KB
Binary file not shown.

windows/blank.bmp

526 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)