Skip to content

Commit

Permalink
Remove old windows app
Browse files Browse the repository at this point in the history
  • Loading branch information
chenilim committed Mar 5, 2021
1 parent d302e55 commit 910ac33
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 245 deletions.
40 changes: 0 additions & 40 deletions .github/workflows/build-win.yml

This file was deleted.

19 changes: 15 additions & 4 deletions .github/workflows/prod-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ jobs:
- name: Replace token 2
run: sed -i -e "s,placeholder_rudder_key,${{ secrets.RUDDER_PROD_KEY }},g" ${{ github.workspace }}/server/services/telemetry/telemetry.go

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.2

- name: win-node-env
run: npm install -g win-node-env

Expand All @@ -112,13 +115,21 @@ jobs:
with:
go-version: 1.15

- name: Build Windows app
run: make win-app
- name: Setup NuGet
uses: nuget/setup-nuget@v1
with:
nuget-version: '5.x'

- name: NuGet Restore
run: nuget restore win-wpf\Focalboard.sln

- name: Build Windows WPF app
run: make win-wpf-app
env:
BUILD_NUMBER: ${{ github.run_id }}

- name: Upload app package
uses: actions/upload-artifact@v1
with:
name: focalboard-win.zip
path: ${{ github.workspace }}/win/dist/focalboard-win.zip
name: focalboard.msix
path: ${{ github.workspace }}/win-wpf/focalboard.msix
20 changes: 3 additions & 17 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: prebuild clean cleanall ci server server-mac server-linux server-win server-linux-package generate watch-server webapp mac-app win-app linux-app
.PHONY: prebuild clean cleanall ci server server-mac server-linux server-win server-linux-package generate watch-server webapp mac-app win-app-wpf linux-app

PACKAGE_FOLDER = focalboard

Expand Down Expand Up @@ -106,21 +106,6 @@ mac-app: server-mac webapp
cp webapp/NOTICE.txt mac/dist/webapp-NOTICE.txt
cd mac/dist; zip -r focalboard-mac.zip Focalboard.app MIT-COMPILED-LICENSE.md NOTICE.txt webapp-NOTICE.txt

win-app: server-win webapp
rm -rf win/temp
rm -rf win/dist
cd win; make build
mkdir -p win/temp
cp bin/win/focalboard-server.exe win/temp
cp app-config.json win/temp/config.json
cp build/MIT-COMPILED-LICENSE.md win/temp
cp NOTICE.txt win/temp
cp webapp/NOTICE.txt win/temp/webapp-NOTICE.txt
cp -R webapp/pack win/temp/pack
mkdir -p win/dist
# cd win/temp; tar -acf ../dist/focalboard-win.zip .
cd win/temp; powershell "Compress-Archive * ../dist/focalboard-win.zip"

win-wpf-app: server-dll webapp
cd win-wpf && ./build.bat && ./package.bat

Expand Down Expand Up @@ -159,7 +144,8 @@ clean:
rm -rf mac/temp
rm -rf mac/dist
rm -rf linux/dist
rm -rf win/dist
rm -rf win-wpf/msix
rm win-wpf/focalboard.msix

cleanall: clean
rm -rf webapp/node_modules
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ You can build standalone apps that package the server to run locally against SQL
* Windows:
* Open a git-bash prompt
* Install win-node-env `npm install -g win-node-env`
* `make win-app`
* run `win/dist/focalboard.exe`
* `make win-wpf-app`
* run `cd win-wpf/msix && focalboard.exe`
* *Requires: Windows 10*

Cross-compilation currently isn't fully supported, so please build on the appropriate platform. Refer to the GitHub Actions workflows (build-mac.yml, build-win.yml, build-ubuntu.yml) for the detailed list of steps on each platform.
Expand Down
10 changes: 0 additions & 10 deletions win/Makefile

This file was deleted.

9 changes: 0 additions & 9 deletions win/go.mod

This file was deleted.

19 changes: 0 additions & 19 deletions win/go.sum

This file was deleted.

144 changes: 0 additions & 144 deletions win/main.go

This file was deleted.

0 comments on commit 910ac33

Please sign in to comment.