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

[build website]patch docs #77

Merged
merged 3 commits into from
Aug 30, 2023
Merged

[build website]patch docs #77

merged 3 commits into from
Aug 30, 2023

Conversation

StarTrooper08
Copy link
Collaborator

PR for issue no #40 #43

image

image

The patchdir should be mention in dockerfile!?

Comment on lines 7 to 13
If necessary, update R-devel

```bash
cd $TOP_SRCDIR
svn update
cd $BUILDDIR
make # this will run the configure as before
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to update this for the new $TOP_SRCDIR and $BUILDDIR. I suggest we always use "R-devel" as the default name for the built version

Suggested change
If necessary, update R-devel
```bash
cd $TOP_SRCDIR
svn update
cd $BUILDDIR
make # this will run the configure as before
If necessary, update the version of R you are working on, with the latest changes in <https://svn.r-project.org/R/trunk/>. E.g., if the version of R you are working on is named "R-devel-working"
```bash
cd $TOP_SRCDIR/R-devel-working
svn update
cd $BUILDDIR/R-devel-working
make # this will run the configure as before

Copy link
Member

@hturner hturner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry forgot to actually submit the review!

3. Then create a patch

```bash
cd "$TOP_SRCDIR"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
cd "$TOP_SRCDIR"
cd "$TOP_SRCDIR/R-devel-working"

```bash
cd "$TOP_SRCDIR"
svn update
svn diff > patch.diff
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
svn diff > patch.diff
svn diff > $PATCHDIR/patch.diff

Comment on lines 31 to 35
This is not ideal though as the patch file will be in $TOP_SRCDIR and we want to keep that clean. Also we want our patches easy to find. Perhaps we can also define a PATCHDIR?

PATCHDIR=/workspaces/r-dev-env/patches
mkdir $PATCHDIR
svn diff > $PATCHDIR/patch.diff
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part doesn't need to be in documentation. Instead

  1. Define the PATCHDIR env variable in the Docker container
  2. Make the corresponding directory when the container is created - put it in the bash script or use PostCreateCommand?


#### 1) Change Directory to TOP_SRCDIR

If you are currently inside the BUILDDIR directory or root directory(/workspaces/r-dev-env) make sure to change it to TOP_SRCDIR so that we can update the changes made inside our source code.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
If you are currently inside the BUILDDIR directory or root directory(/workspaces/r-dev-env) make sure to change it to TOP_SRCDIR so that we can update the changes made inside our source code.
If you are currently inside the BUILDDIR directory or root directory(/workspaces/r-dev-env) make sure to change it to the source directory for the version of R you are working on so that we can update the changes made inside our source code. For example,

If you are currently inside the BUILDDIR directory or root directory(/workspaces/r-dev-env) make sure to change it to TOP_SRCDIR so that we can update the changes made inside our source code.

```bash
cd $TOP_SRCDIR
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
cd $TOP_SRCDIR
cd $TOP_SRCDIR/R-devel-working

To rebuild the R version and reflect on the changes made, we want to change directory to BUILDDIR from TOP_SRCDIR

```bash
cd $BUILDDIR
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
cd $BUILDDIR
cd $BUILDDIR/R-devel-working

Comment on lines +64 to +65
make check
make
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
make check
make
make
make check

@hturner hturner merged commit 826e9c7 into devel Aug 30, 2023
@hturner hturner deleted the patch-docs branch August 30, 2023 13:43
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.

2 participants