Merge pull request #34 from gamingdoom/unstable

Windows build and updated prefs

.github/workflows/build-linux-x86_64.yml

@@ -25,6 +25,12 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
+      - name: Cache
+        uses: actions/cache@v3.0.11
+        with:
+          path: mozilla-unified
+          key: ${{ runner.os }}-mozilla-unified
+
       # Runs a set of commands using the runners shell
       - name: Get deps, build and package
         run: |

.github/workflows/build-win64.yml

@@ -22,7 +22,15 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
-
+
+      - name: Cache
+        uses: actions/cache@v2.1.6
+        with:
+        # A list of files, directories, and wildcard patterns to cache and restore
+          path: mozilla-unified
+        # An explicit key for restoring and saving the cache
+          key: ${{ runner.os }}-mozilla-unified
+
       # Runs a set of commands using the runners shell
       - name: Run a multi-line script
         run: |
@@ -40,10 +48,3 @@ jobs:
           # A file, directory or wildcard pattern that describes what to upload
           path: work/datcordSetup-win64.exe
 
-      - name: Cache
-        uses: actions/cache@v2.1.6
-        with:
-        # A list of files, directories, and wildcard patterns to cache and restore
-          path: obj-x86_64-pc-linux-gnu/*
-        # An explicit key for restoring and saving the cache
-          key: ${{ runner.os }}

README.md

@@ -41,7 +41,7 @@
 	    ./datcord
 	    ```
  - # Windows
-   - A windows build is available from GitHub Actions but is not finished yet.
+   - The Windows installer is available from releases.
 
   ## Open With Setup
   #### [Open With](https://github.com/darktrojan/openwith) allows you to open links from Datcord in other browsers. To set it up, follow these instructions:
@@ -50,8 +50,9 @@
 
 	- If you are using Datcord from tarball or AUR, run ``datcord "about:addons"`` on the command line.
 	- If you are using the AppImage and you have integrated it, run ``~/Applications/Datcord-* "about:addons"`` in the terminal.
+	- If you are using Windows, run ``"C:\Program Files\Datcord\datcord.exe" about:addons`` in cmd.
 
-  - Click the "meatball menu" (3 horizontal dots) next to the on/off switch for Open With and select preferences.
+  - Click the "meatball menu" (3 horizontal dots) next to the on/off switch for Open With and select preferences/options.
   - Follow all setup instructions for Open With.
   - Press ctrl+w to close tabs until Datcord closes.
   #### Open With should now be setup and you can use it by right clicking on links.

buildDatcordWin.sh

@@ -1,7 +1,10 @@
 # Run with MozillaBuild
 basedir=$(dirname "$0")
-curl https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py --output bootstrap.py
-python3 bootstrap.py --no-interactive
+if [[ ! -d mozilla-unified ]] 
+then
+  curl https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py --output bootstrap.py
+  python3 bootstrap.py --no-interactive
+fi
 cp -rf $basedir/changed/* mozilla-unified/
 # It is using nightly branding no matter what so we replace the nightly stuff with our stuff
 cp -rf mozilla-unified/browser/branding/unofficial/* mozilla-unified/browser/branding/nightly/*
@@ -28,16 +31,13 @@ cd datcord
 mv firefox.exe datcord.exe
 cd ..
 cp ../windows/datcord.ico datcord/
+cp -r ../distribution datcord/
 # Based on librewolf mk.py
 mkdir x86-ansi
 wget -q -O ./x86-ansi/nsProcess.dll https://shorsh.de/upload/we7v/nsProcess.dll
 wget -q -O ./vc_redist.x64.exe https://aka.ms/vs/17/release/vc_redist.x64.exe
 cp ../windows/setup.nsi .
 cp ../windows/datcord.ico .
 cp ../windows/banner.bmp .
-Xcopy /E /I ../distribution ./
 makensis.exe -V1 setup.nsi
 # Setup filename will be datcordSetup-win64.exe
-
-
-