Stop shipping the build toolchain in the tarball
ModuleBundleBuildDir/LibraryR was being staged as ModuleLibrary/, 283 MB of devtools, roxygen2, testthat, pkgdown, rcmdcheck and jaspModuleTools. That is the toolchain that *builds* module bundles; JASP loads none of it at runtime. I added it when I still believed the module directories were source trees missing their library. Once that turned out to be wrong - the bundles carry their own dependency closure, jaspTTests alone unpacks to 139 content-addressed package directories - the staging should have been removed and was not.
This commit is contained in:
+6
-5
@@ -374,8 +374,12 @@ cp -a "$R_HOME_DIR" "$STAGE_DIR$PREFIX/"
|
||||
# package is meant to remove.
|
||||
#
|
||||
# Modules/local the compiled module bundles themselves
|
||||
# LibraryR the R library they were built with (jaspModuleTools, devtools
|
||||
# and ~95 dependencies), compiled against the bundled R 4.5.3
|
||||
#
|
||||
# ModuleBundleBuildDir/LibraryR is deliberately NOT shipped: it is the *build*
|
||||
# toolchain (devtools, roxygen2, testthat, pkgdown, rcmdcheck, jaspModuleTools),
|
||||
# not anything JASP loads at runtime. Each .JASPModule already carries its own
|
||||
# dependency closure — jaspTTests alone unpacks to 139 content-addressed package
|
||||
# directories — so the library would be 283 MB of pure duplication.
|
||||
#
|
||||
# ModuleBundleBuildDir/Modules is deliberately NOT copied: it is the cloned
|
||||
# module *sources* (no compiled objects at all), several hundred MB of git
|
||||
@@ -385,9 +389,6 @@ install -d "$STAGE_DIR$PREFIX/Modules"
|
||||
log "staging module bundles from ${MODULE_BUNDLES}"
|
||||
cp -a "$MODULE_BUNDLES/." "$STAGE_DIR$PREFIX/Modules/"
|
||||
|
||||
log "staging module R library from ${MODULE_LIBRARY}"
|
||||
install -d "$STAGE_DIR$PREFIX/ModuleLibrary"
|
||||
cp -a "$MODULE_LIBRARY/." "$STAGE_DIR$PREFIX/ModuleLibrary/"
|
||||
|
||||
install -Dm644 /work/packaging/org.jaspstats.JASP.desktop \
|
||||
"$STAGE_DIR/usr/share/applications/org.jaspstats.JASP.desktop"
|
||||
|
||||
Reference in New Issue
Block a user