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

Enable cellar on Windows #5750

Merged
merged 2 commits into from
Dec 3, 2024
Merged

Enable cellar on Windows #5750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c718ec7
Update createCellarFromRenvCache.py
RensDofferhoff Dec 3, 2024
5f652ac
Update JASP.cmake
RensDofferhoff Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tools/CMake/JASP.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ if(R_PKG_CELLAR_DOWNLOAD_REMOTE AND R_PKG_CELLAR_PATH STREQUAL "${CMAKE_BINARY_D
SET(R_PKG_CELLAR_REMOTE "https://static.jasp-stats.org/development/cellars/cellar_macOS_arm64_latest.tar.gz")
endif()
elseif(WIN32)
# SET(R_PKG_CELLAR_REMOTE "https://static.jasp-stats.org/development/cellars/cellar_Windows_x86_64_latest.tar.gz")
SET(R_PKG_CELLAR_REMOTE "https://static.jasp-stats.org/development/cellars/cellar_Windows_x86_64_latest.tar.gz")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion Tools/createCellarFromRenvCache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def main():
parser.add_argument('renv_cache')
parser.add_argument('--inner_extension', required=False)
args = parser.parse_args()
extension = args.inner_extension if args.inner_extension != None else ('.zip' if platform.system() == 'Windows' else '.tgz')
extension = args.inner_extension if args.inner_extension != None else '.tar.gz'
build_cellar(args.renv_cache, extension)

if __name__ == "__main__":
Expand Down
Loading