Merge pull request #44 from uroesch/sync/update-2021-01-01

uroesch · Jan 1, 2021 · e66639a · e66639a
2 parents c917480 + 19abf84
commit e66639a
Showing 1 changed file with 82 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -88,56 +88,119 @@ To unblock the installer and install the application follow the annotated screen
 <!-- Start include BUILD.md -->
 ### Build
 
-#### Preparation 
+#### Windows 
+
+##### Windows 10
 
-##### Install build infra
+The only supported build platform for Windows is version 10 other releases
+have not been tested.
 
-Note: When building with docker this steps is not required. 
+###### Clone repositories
 
 ```
 git clone https://github.com/uroesch/PortableApps.comInstaller.git
 git clone -b patched https://github.com/uroesch/PortableApps.comLauncher.git
+git clone https://github.com/uroesch/LdapAdminPortable.git
 ```
 
-##### Clone repository
+###### Build installer
+
+```
+cd LdapAdminPortable
+powershell -ExecutionPolicy ByPass -File Other/Update/Update.ps1
+```
+
+#### Linux
+
+##### Docker
+
+Note: This is currently the preferred way of building the PortableApps installer.
+
+For a Docker build run the following command.
+
+###### Clone repo
 
 ```
 git clone https://github.com/uroesch/LdapAdminPortable.git
+```
+
+###### Build installer
+
+```
 cd LdapAdminPortable
+curl -sJL https://raw.githubusercontent.com/uroesch/PortableApps/master/scripts/docker-build.sh | bash
 ```
 
-#### Windows 
+#### Local build
 
-##### Windows 10
+##### Ubuntu 20.04
 
-The only supported build platform for Windows is version 10 other releases
-have not been tested.
+To build the installer under Ubuntu 20.04 `Wine`, `PowerShell`, `7-Zip` and when building headless
+`Xvfb` are required. 
+
+###### Setup
+```
+sudo snap install powershell --classic
+sudo apt --yes install git wine p7zip-full xvfb
+```
 
-To build the installer run the following command in the root of the git
-repository.
+When building headless run the below command starts a virtual Xserver required for the build to
+succeed.
 
 ```
-powershell -ExecutionPolicy ByPass -File Other/Update/Update.ps1
+export DISPLAY=:7777
+Xvfb ${DISPLAY} -ac &
 ```
 
-#### Linux
+###### Clone repositories
 
-##### Docker
+```
+git clone https://github.com/uroesch/PortableApps.comInstaller.git
+git clone -b patched https://github.com/uroesch/PortableApps.comLauncher.git
+git clone https://github.com/uroesch/LdapAdminPortable.git
+```
 
-Note: This is currently the preferred way of building the PortableApps installer.
+###### Build installer
 
-For a Docker build run the following command.
+```
+cd LdapAdminPortable
+pwsh Other/Update/Update.ps1
+```
 
+##### Ubuntu 18.04
+
+To build the installer under Ubuntu 18.04 `Wine`, `PowerShell`, `7-Zip` and when building headless
+`Xvfb` are required. 
+
+###### Setup
 ```
-curl -sJL https://raw.githubusercontent.com/uroesch/PortableApps/master/scripts/docker-build.sh | bash
+sudo snap install powershell --classic
+sudo apt --yes install git p7zip-full xvfb
+sudo dpkg --add-architecture i386
+sudo apt update
+sudo apt --yes install wine32
 ```
 
-#### Local build
+When building headless run the below command starts a virtual Xserver required for the build to
+succeed.
 
-To build the installer under Linux with `Wine` and `PowerShell` installed run the
-command below.
+```
+export DISPLAY=:7777
+Xvfb ${DISPLAY} -ac &
+```
+
+###### Clone repositories
 
 ```
+git clone https://github.com/uroesch/PortableApps.comInstaller.git
+git clone -b patched https://github.com/uroesch/PortableApps.comLauncher.git
+git clone https://github.com/uroesch/LdapAdminPortable.git
+```
+
+###### Build installer
+
+```
+cd LdapAdminPortable
 pwsh Other/Update/Update.ps1
 ```
 <!-- End include BUILD.md -->