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.

Sign up for GitHub

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

Jump to bottom

Renv Lockfiles + Flatpak Dev modules #5556

Merged
merged 46 commits into from
Jul 17, 2024
Merged

Renv Lockfiles + Flatpak Dev modules #5556

merged 46 commits into from
Jul 17, 2024

Commits on Jul 15, 2024

  1. 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
    @vandenman @RensDofferhoff
    vandenman authored and RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    7df0b8b View commit details
    Browse the repository at this point in the history

  2. dont use Rscript 

    now it builds again on macos arm without R installed
    @JorisGoosen @RensDofferhoff
    JorisGoosen authored and RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    c423de5 View commit details
    Browse the repository at this point in the history

  3. make it build on windows again

    @JorisGoosen @RensDofferhoff
    JorisGoosen authored and RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    88dbe3f View commit details
    Browse the repository at this point in the history

  4. fix some path finding cmake

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    be85444 View commit details
    Browse the repository at this point in the history

  5. pre install hacks no longer needed

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    6efdc88 View commit details
    Browse the repository at this point in the history

  6. progress

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    a22e522 View commit details
    Browse the repository at this point in the history

  7. works on windows now?

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    2447c2e View commit details
    Browse the repository at this point in the history

  8. Merge mistake

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    1b5d7c5 View commit details
    Browse the repository at this point in the history

  9. Update jasprcpp.cpp

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    2827b9e View commit details
    Browse the repository at this point in the history

  10. Fix symlink relativation on MAC

    @RensDofferhoff
    rens authored and RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    8bf4c5d View commit details
    Browse the repository at this point in the history

  11. fix windows stuff

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    f2521b2 View commit details
    Browse the repository at this point in the history

  12. Update symlinkTools.R

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    143ab39 View commit details
    Browse the repository at this point in the history

  13. progress'

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    18fee8c View commit details
    Browse the repository at this point in the history

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

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    ffebc81 View commit details
    Browse the repository at this point in the history

  15. update ModuleInstaller to linux fixed version

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    144d37f View commit details
    Browse the repository at this point in the history

  16. make sure we dont forget any Modules

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    d08c950 View commit details
    Browse the repository at this point in the history

  17. remove leftover logic to collect and restore flatpak cran now surpass… 

    …ed by using simple cellar
    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    3d3b585 View commit details
    Browse the repository at this point in the history

  18. fix on mac again

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    74a3637 View commit details
    Browse the repository at this point in the history

  19. fix v8

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    2604c01 View commit details
    Browse the repository at this point in the history

  20. fix

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    7a45d99 View commit details
    Browse the repository at this point in the history

  21. fix jaspBase compilation

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    98c0b14 View commit details
    Browse the repository at this point in the history

  22. devmodules ?

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    3f19587 View commit details
    Browse the repository at this point in the history

  23. update jaspModuleInstaller

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    3ce6202 View commit details
    Browse the repository at this point in the history

  24. update module installer

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    14d2a24 View commit details
    Browse the repository at this point in the history

  25. this seems to work for Linux local builds at least

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    bb71599 View commit details
    Browse the repository at this point in the history

  26. submodule update

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    f930f68 View commit details
    Browse the repository at this point in the history

  27. merge mistakes

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    3eb732a View commit details
    Browse the repository at this point in the history

  28. windows.....

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    aac251f View commit details
    Browse the repository at this point in the history

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

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    5d397ec View commit details
    Browse the repository at this point in the history

  30. update module installer to fix windows

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    a0ecfd3 View commit details
    Browse the repository at this point in the history

  31. okay one more thing for windows

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    1a3e4ca View commit details
    Browse the repository at this point in the history

  32. Enable all modules

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    8db2eba View commit details
    Browse the repository at this point in the history

  33. Update cleanFlatpak.sh

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    f399ce8 View commit details
    Browse the repository at this point in the history

  34. Update cleanFlatpak.sh

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    3f140a0 View commit details
    Browse the repository at this point in the history

  35. load jaspBase first before loading module

    @RensDofferhoff
    Rens authored and RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    5b0701d View commit details
    Browse the repository at this point in the history

  36. Update install-module.R.in

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    8e78b5e View commit details
    Browse the repository at this point in the history

  37. Update setup_renv_rcpp_rinside.R.in

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    cd9ff5c View commit details
    Browse the repository at this point in the history

  38. Update cleanFlatpak.sh

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    09dae09 View commit details
    Browse the repository at this point in the history

  39. re-add the header includes that are definetly needed

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    d9c882d View commit details
    Browse the repository at this point in the history

  40. Fix configure vars for jaspColumnEncoder

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    3d9a3ea View commit details
    Browse the repository at this point in the history

  41. rewrite scary construction in DynamicModule::generateModuleInstallingR

    @JorisGoosen @RensDofferhoff
    JorisGoosen authored and RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    f076205 View commit details
    Browse the repository at this point in the history

  42. update module installer

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    8457dc3 View commit details
    Browse the repository at this point in the history

  43. fix problems caused by -j

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    3879c57 View commit details
    Browse the repository at this point in the history

  44. update submodules

    @RensDofferhoff
    RensDofferhoff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    78d4157 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. try to satisfy the new flatpak regs

    @RensDofferhoff
    RensDofferhoff committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    08c4552 View commit details
    Browse the repository at this point in the history

  2. try to satisfy the new flatpak regs again

    @RensDofferhoff
    RensDofferhoff committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    d8b06bc View commit details
    Browse the repository at this point in the history