Code

Renv Lockfiles#5629

Code

Merged

RensDofferhoff merged 47 commits intojasp-stats:developmentjasp-stats/jasp-desktop:developmentfrom RensDofferhoff:backupRensDofferhoff/jasp-desktop:backupCopy head branch name to clipboardJul 17, 2024

+974-6,840

Commits

Commits on Jul 17, 2024

• use new module installation mechanism

  Show description for 4974224
  

  vandenman

  authored and

  RensDofferhoff

  committed
  4974224

  Copy full SHA for 4974224

• dont use Rscript

  Show description for baed080
  

  JorisGoosen

  authored and

  RensDofferhoff

  committed
  baed080

  Copy full SHA for baed080

• make it build on windows again

  

  JorisGoosen

  authored and

  RensDofferhoff

  committed
  24e6f70

  Copy full SHA for 24e6f70

• fix some path finding cmake

  RensDofferhoff

  committed
  019e1e9

  Copy full SHA for 019e1e9

• pre install hacks no longer needed

  RensDofferhoff

  committed
  39873d0

  Copy full SHA for 39873d0

• progress

  RensDofferhoff

  committed
  5fa64be

  Copy full SHA for 5fa64be

• works on windows now?

  RensDofferhoff

  committed
  3ed8b05

  Copy full SHA for 3ed8b05

• Merge mistake

  RensDofferhoff

  committed
  255102e

  Copy full SHA for 255102e

• Update jasprcpp.cpp

  RensDofferhoff

  committed
  dd98b57

  Copy full SHA for dd98b57

• Fix symlink relativation on MAC

  

  rens

  authored and

  RensDofferhoff

  committed
  12833ae

  Copy full SHA for 12833ae

• fix windows stuff

  RensDofferhoff

  committed
  fa3bb1f

  Copy full SHA for fa3bb1f

• Update symlinkTools.R

  RensDofferhoff

  committed
  5e246e0

  Copy full SHA for 5e246e0

• progress'

  RensDofferhoff

  committed
  dbdfe32

  Copy full SHA for dbdfe32

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

  RensDofferhoff

  committed
  8763a34

  Copy full SHA for 8763a34

• update ModuleInstaller to linux fixed version

  RensDofferhoff

  committed
  b172526

  Copy full SHA for b172526

• make sure we dont forget any Modules

  RensDofferhoff

  committed
  7b54488

  Copy full SHA for 7b54488

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

  RensDofferhoff

  committed
  26ae536

  Copy full SHA for 26ae536

• fix on mac again

  RensDofferhoff

  committed
  353cb7a

  Copy full SHA for 353cb7a

• fix v8

  RensDofferhoff

  committed
  4cac932

  Copy full SHA for 4cac932

• fix

  RensDofferhoff

  committed
  fdc11bb

  Copy full SHA for fdc11bb

• fix jaspBase compilation

  RensDofferhoff

  committed
  27a2ae0

  Copy full SHA for 27a2ae0

• devmodules ?

  RensDofferhoff

  committed
  a88a575

  Copy full SHA for a88a575

• update jaspModuleInstaller

  RensDofferhoff

  committed
  7a41f53

  Copy full SHA for 7a41f53

• update module installer

  RensDofferhoff

  committed
  7b13e69

  Copy full SHA for 7b13e69

• this seems to work for Linux local builds at least

  RensDofferhoff

  committed
  172020e

  Copy full SHA for 172020e

• submodule update

  RensDofferhoff

  committed
  7c5455f

  Copy full SHA for 7c5455f

• merge mistakes

  RensDofferhoff

  committed
  d41813e

  Copy full SHA for d41813e

• windows.....

  RensDofferhoff

  committed
  a5f7916

  Copy full SHA for a5f7916

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

  RensDofferhoff

  committed
  7dbafe6

  Copy full SHA for 7dbafe6

• update module installer to fix windows

  RensDofferhoff

  committed
  792139c

  Copy full SHA for 792139c

• okay one more thing for windows

  RensDofferhoff

  committed
  41bd897

  Copy full SHA for 41bd897

• Enable all modules

  RensDofferhoff

  committed
  dc8fd31

  Copy full SHA for dc8fd31

• Update cleanFlatpak.sh

  RensDofferhoff

  committed
  61111bb

  Copy full SHA for 61111bb

• Update cleanFlatpak.sh

  RensDofferhoff

  committed
  15b1913

  Copy full SHA for 15b1913

• load jaspBase first before loading module

  

  Rens

  authored and

  RensDofferhoff

  committed
  b17817a

  Copy full SHA for b17817a

• Update install-module.R.in

  RensDofferhoff

  committed
  93629bd

  Copy full SHA for 93629bd

• Update setup_renv_rcpp_rinside.R.in

  RensDofferhoff

  committed
  9f22e4e

  Copy full SHA for 9f22e4e

• Update cleanFlatpak.sh

  RensDofferhoff

  committed
  753e83d

  Copy full SHA for 753e83d

• re-add the header includes that are definetly needed

  RensDofferhoff

  committed
  e395ad4

  Copy full SHA for e395ad4

• Fix configure vars for jaspColumnEncoder

  RensDofferhoff

  committed
  c03287b

  Copy full SHA for c03287b

• rewrite scary construction in DynamicModule::generateModuleInstallingR

  

  JorisGoosen

  authored and

  RensDofferhoff

  committed
  4c2d938

  Copy full SHA for 4c2d938

• update module installer

  RensDofferhoff

  committed
  ecd5f67

  Copy full SHA for ecd5f67

• fix problems caused by -j

  RensDofferhoff

  committed
  2200083

  Copy full SHA for 2200083

• update submodules

  RensDofferhoff

  committed
  e539c1c

  Copy full SHA for e539c1c

• try to satisfy the new flatpak regs

  RensDofferhoff

  committed
  c804f37

  Copy full SHA for c804f37

• try to satisfy the new flatpak regs again

  RensDofferhoff

  committed
  0424321

  Copy full SHA for 0424321

• fix readstat search on fedora

  RensDofferhoff

  authored
  b9d6780

  Copy full SHA for b9d6780