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

Renv Lockfiles #5629

Merged
merged 47 commits into from
Jul 17, 2024
Merged

Renv Lockfiles #5629

merged 47 commits into from
Jul 17, 2024

Conversation

RensDofferhoff
Copy link
Contributor

No description provided.

vandenman and others added 30 commits July 17, 2024 14:33
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
now it builds again on macos arm without R installed
@RensDofferhoff RensDofferhoff merged commit 24b71e1 into jasp-stats:development Jul 17, 2024
1 check failed
JorisGoosen added a commit that referenced this pull request Sep 30, 2024
* 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>
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.

3 participants