Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add .exe installer on Windows #5674

Open
wants to merge 63 commits into
base: development
Choose a base branch
from

Conversation

shun2wang
Copy link
Contributor

@shun2wang shun2wang commented Sep 21, 2024

Let's throw the msi away!

Now we will have a quick, simple and intuitive .exe installer:
图片

图片

  • Both install for Administrator and per-users

  • Multiple language chooses while installing

  • Installing from the command line

  • Better scalability and maintainability

  • Set for build bot

  • Uninstal clean up

  • Maybe shour run with some parameters after installed.

  • Signature

RensDofferhoff and others added 30 commits July 17, 2024 16:26
* use new module installation mechanism

very basic functionality works

start on making hashes work

seems more or less functional now

started rewriting cmake, stuff compiles but crashes at runtime

everything seems functional on Linux

windows fixes, stuff compiles but weird runtime error

building on windows works from a clean build, but more testing is needed

more tweaks, update to renv 1.0.2

updates for fallback without lockfile

start unifying stuff across OSes

autogenerated lockfiles seem to be work okay but need more testing

reorganize file + pkgdepends fallback

bump jaspModuleInstaller

spaces -> tabs

bump jaspModuleInstaller

spaces -> tabs

moved getModuleDependencies to jaspModuleInstaller

call setupRenv in setup_renv_rcpp_rinside_jaspModuleInstaller.R.in

remove custom Matrix installation

make configuration work on macos

compilation still fails though...

do follow symlinks otherwise it patches nothing

move searching for fortran outside of the "does framework not exist if()f"

jaspModuleInstaller and fixing of r pkgs needs jaspEngine

so change the order in which things are installed

add R_LIBS for windows and macos

make windows start

* dont use Rscript

now it builds again on macos arm without R installed

* make it build on windows again

* fix some path finding  cmake

* pre install hacks no longer needed

* progress

* works on windows now?

* Merge mistake

* Update jasprcpp.cpp

* Fix symlink relativation on MAC

* fix windows stuff

* Update symlinkTools.R

* progress'

* now works on linux and flatpak(from cellar + lockfiles)

* update ModuleInstaller to linux fixed version

* make sure we dont forget any Modules

* remove leftover logic to collect and restore flatpak cran now surpassed by using simple cellar

* fix on mac again

* fix v8

* fix

* fix jaspBase compilation

* devmodules ?

* update jaspModuleInstaller

* update module installer

* this seems to work for Linux local builds at least

* submodule update

* merge mistakes

* windows.....

* windows couldn't find module installer because we were overwitting it

* update module installer to fix windows

* okay one more thing for windows

* Enable all modules

* Update cleanFlatpak.sh

* Update cleanFlatpak.sh

* load jaspBase first before loading module

* Update install-module.R.in

* Update setup_renv_rcpp_rinside.R.in

* Update cleanFlatpak.sh

* re-add the header includes that are definetly needed

* Fix configure vars for jaspColumnEncoder

* rewrite scary construction in DynamicModule::generateModuleInstallingR

* update module installer

* fix problems caused by -j

* update submodules

* try to satisfy the  new flatpak regs

* try to satisfy the  new flatpak regs again

* fix readstat search on fedora

---------

Co-authored-by: vandenman <donvdbergh@hotmail.com>
Co-authored-by: Joris Goosen <joris@jorisgoosen.nl>
Co-authored-by: rens <rens@renss-MacBook-Pro.local>
Co-authored-by: Rens <example>
* Translated using Weblate (Spanish)

Currently translated at 100.0% (1108 of 1108 strings)

Translation: JASP/jaspDesktop
Translate-URL: https://hosted.weblate.org/projects/jasp/jaspdesktop/es/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1108 of 1108 strings)

Translation: JASP/jaspDesktop
Translate-URL: https://hosted.weblate.org/projects/jasp/jaspdesktop/zh_Hans/

* Translated using Weblate (Galician)

Currently translated at 100.0% (1108 of 1108 strings)

Translation: JASP/jaspDesktop
Translate-URL: https://hosted.weblate.org/projects/jasp/jaspdesktop/gl/

* Translated using Weblate (German)

Currently translated at 98.9% (1096 of 1108 strings)

Translation: JASP/jaspDesktop
Translate-URL: https://hosted.weblate.org/projects/jasp/jaspdesktop/de/

* Translated using Weblate (Turkish)

Currently translated at 7.9% (88 of 1108 strings)

Translation: JASP/jaspDesktop
Translate-URL: https://hosted.weblate.org/projects/jasp/jaspdesktop/tr/

---------

Co-authored-by: ecadrian <ecadrian@hotmail.com>
Co-authored-by: Shun Wang <shuonwang@gmail.com>
Co-authored-by: Johannes Keyser <joke@fsfe.org>
Co-authored-by: blomusti <m.f.varkara@gmail.com>
* first upgrade to Quill-2.0

* also bump the highlight version

* make code highlight looks better

* fix rSyntax highlight
Currently translated at 98.9% (1096 of 1108 strings)

Translation: JASP/jaspDesktop
Translate-URL: https://hosted.weblate.org/projects/jasp/jaspdesktop/de/

Co-authored-by: Johannes Keyser <joke@fsfe.org>
* add sqlite compile options to increase column limit

* Fix CSV loader segfault

---------

Co-authored-by: Rens <example>
…p-stats#5640)

* Fix Arch Linux install dep in Linux build guide

JAGS is not available in the official repos only in the aur

* Fix typo in Linux build guide
* Update Linux Dev Guide

* Update Docs/development/jasp-module-workflow.md

Co-authored-by: Shun Wang <shuonwang@gmail.com>

* Update Docs/development/jasp-module-workflow.md

Co-authored-by: Shun Wang <shuonwang@gmail.com>

---------

Co-authored-by: Shun Wang <shuonwang@gmail.com>
* docs: deprecated `suggestedColumns` in docs

* suggestedColumns -> allowedColumns
dont add each column separately but just create the table from scratch, making sure that the filter-column is still first
JorisGoosen and others added 23 commits September 10, 2024 13:37
* syntaxhighlighting improvements

adds support for highlighting columnnames from JASP (including names with spaces that are allowed within JASP)
also makes sure to do the comment rule only at the end to make sure comments are entirely commented to avoid confusing users

* clean up and fix `` stringso
also log how long it took to load or synch a file

Why remove WAL?
It was faster yes, but often the engine would not have the up-to-date info and then crash.
Adding walcheckpoints all over the place didnt seem to help

the slowdown is a bit noticeable with >3000k columns, but given that we didnt support them before shouldnt be a big problem.

For speed comparisons:

        WAL     NO-WAL
3KC      4s        10s
10KC    28s        54s
200KR   30s        30s
1MR    146s       147s
1KR5KC 347s       356s

Where the "R" sets have 2 columns and the "C" sets have a single row.
As can be seen, there *is* a delay for 1K cols and above, but it seems constant.
And any fixes for the synching-db problem with the engine most likely includes adding new delays...
So lets just turn it off
* implement importing excel files

* update ubuntu build bot

* work on Windows

* code style formatting and cleanup

* add to installer and file type support

* showing file type filter as a list

* Use conan to load freexl

* add some missing supported filetypes to macos manifest thing

* use jasp-stats fork of shuns fixes for freexl

* address reviews suggestions

* fix build on Linux

* some cleanup and comments

* replace newlines in excel cell value

---------

Co-authored-by: boutinb <b.boutin@uva.nl>
Co-authored-by: Joris Goosen <joris@jorisgoosen.nl>
…asp-stats#5586)

* Add fieldWidth property to Dropdown

* let dropdown participate in aligning labelwidths

This is now easily addable to any qml control by adding the property controlXOffset and applying it to the relevant leftPadding

* use new aligning in prefsUI

---------

Co-authored-by: Joris Goosen <Joris@JorisGoosen.nl>
* Translated using Weblate (Spanish)

Currently translated at 100.0% (1110 of 1110 strings)

Translation: JASP/jaspDesktop
Translate-URL: https://hosted.weblate.org/projects/jasp/jaspdesktop/es/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1110 of 1110 strings)

Translation: JASP/jaspDesktop
Translate-URL: https://hosted.weblate.org/projects/jasp/jaspdesktop/zh_Hans/

* Translated using Weblate (Galician)

Currently translated at 100.0% (1110 of 1110 strings)

Translation: JASP/jaspDesktop
Translate-URL: https://hosted.weblate.org/projects/jasp/jaspdesktop/gl/

* Translated using Weblate (German)

Currently translated at 98.9% (1098 of 1110 strings)

Translation: JASP/jaspDesktop
Translate-URL: https://hosted.weblate.org/projects/jasp/jaspdesktop/de/

* Translated using Weblate (Hungarian)

Currently translated at 11.8% (91 of 770 strings)

Translation: JASP/jaspDesktop
Translate-URL: https://hosted.weblate.org/projects/jasp/jaspdesktop/hu/

* Translated using Weblate (Hungarian)

Currently translated at 45.0% (347 of 770 strings)

Translation: JASP/jaspDesktop
Translate-URL: https://hosted.weblate.org/projects/jasp/jaspdesktop/hu/

---------

Co-authored-by: ecadrian <ecadrian@hotmail.com>
Co-authored-by: Shun Wang <shuonwang@gmail.com>
Co-authored-by: Johannes Keyser <joke@fsfe.org>
Co-authored-by: Salyámosy András <salyamos@gmail.com>
* update submodules

* update submodules
* bugfix: replace newlines with _ in CSV cell values

* replace newlines with spaces
* dont use modules for ext

* dont highlight R commander output window

* add highlighter back to R command output window
* Improve installation instructions

- Subsection for installing from source
- Add callouts
- Mention fix for missing development dependency
- Easier code copy-pasting
- Mention flatpak as external package

* Improve clarity by moving common errors to its own subsection

* Reduce visual clutter

* Describe GitHub PAT fix

* Add puzzle visualization
and rename guide to adding module to module structure
beter padding around lists nesxt to constructors

also open filter and variableswindow bigger by default

make sure all operators above filterconstructor are same size, and nicely alligned etc
fixes jasp-stats/INTERNAL-jasp#2650

also dont use [=] to implicitly capture "this" cause its deprecated in c++20, and also rather confusing and dangerous

it is both deprecated and dangerous
If you dont have jaspSem loaded then it will just show an error over the analysis...
* Translated using Weblate (German)

Currently translated at 98.9% (1106 of 1118 strings)

Translation: JASP/jaspDesktop
Translate-URL: https://hosted.weblate.org/projects/jasp/jaspdesktop/de/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1118 of 1118 strings)

Translation: JASP/jaspDesktop
Translate-URL: https://hosted.weblate.org/projects/jasp/jaspdesktop/es/

* Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1118 of 1118 strings)

Translation: JASP/jaspDesktop
Translate-URL: https://hosted.weblate.org/projects/jasp/jaspdesktop/zh_Hans/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (1118 of 1118 strings)

Translation: JASP/jaspDesktop
Translate-URL: https://hosted.weblate.org/projects/jasp/jaspdesktop/es/

* Translated using Weblate (Galician)

Currently translated at 100.0% (1118 of 1118 strings)

Translation: JASP/jaspDesktop
Translate-URL: https://hosted.weblate.org/projects/jasp/jaspdesktop/gl/

---------

Co-authored-by: Johannes Keyser <joke@fsfe.org>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: Shun Wang <shuonwang@gmail.com>
Co-authored-by: ecadrian <ecadrian@hotmail.com>
@JorisGoosen
Copy link
Contributor

We were thinking of just throwing away msi and using only msix + zip.

What is the advantage of also doing this?

@shun2wang
Copy link
Contributor Author

Yes, my main goal is to deprecate MSI.

What is the advantage of also doing this?

Maybe custom install path by users( not everyone want install to C disk).

@JorisGoosen
Copy link
Contributor

You can just install windows store to a different drive too...

Deprecating msi is a great idea though ;)

But going back to installshield... We deprecated that in favour of msi like 6 years ago :p

@tomtomme
Copy link
Member

tomtomme commented Sep 24, 2024

At my university they distribute the msi via https://opsi.org - will it be possible to download the MSIX without a microsoft account and integrate it in software like opsi? I cannot test this on my linux machines because the microsoft store blocks downloads even if I am logged in...

If not, the msi or this new exe stuff might still be needed to deploy jasp on universities / companies.
The zip is not a good solution for this I think, because it lacks file-type / mime integration etc.

@shun2wang
Copy link
Contributor Author

shun2wang commented Sep 24, 2024

But going back to installshield... We deprecated that in favour of msi like 6 years ago :p

Haha history always repeats itself.

But I think we need to consider the module store in the future, maybe we need to select the analysis module at the installation stage. This is the most important. Based on .exe it can be installed selectively, or online (I mean the installation stage, installing/update modules from within JASP is another matter)

@JorisGoosen
Copy link
Contributor

Good points both, and well, I dont particularly like msi so lets see :p

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.