Skip to content

Move OPL macros to PG#1803

Merged
drgrice1 merged 3 commits into
openwebwork:developfrom
pstaabp:move-opl-macros
Dec 21, 2022
Merged

Move OPL macros to PG#1803
drgrice1 merged 3 commits into
openwebwork:developfrom
pstaabp:move-opl-macros

Conversation

@pstaabp

@pstaabp pstaabp commented Sep 19, 2022

Copy link
Copy Markdown
Member

This is a companion to openwebwork/pg#724 and just updates the defaults.config file to point to the new locations of macros.

You will need to checkout openwebwork/pg#724 and openwebwork/webwork-open-problem-library#949

An alternative to checking out the OPL branch you can set in conf/localOverrides.conf the following:

$pg{directories}{macrosPath} = [
   ".",                     # search the problem file's directory
   $courseDirs{macros},
   $pg{directories}{macros},
   "$pg{directories}{macros}/answers",
	 "$pg{directories}{macros}/capa",
	 "$pg{directories}{macros}/contexts",
	 "$pg{directories}{macros}/core",
	 "$pg{directories}{macros}/graph",
	 "$pg{directories}{macros}/math",
	 "$pg{directories}{macros}/misc",
	 "$pg{directories}{macros}/parsers",
	 "$pg{directories}{macros}/ui",
	 "$courseDirs{templates}/Library/macros/Alfred",
         "$courseDirs{templates}/Library/macros/BrockPhysics",
         "$courseDirs{templates}/Library/macros/CollegeOfIdaho",
         "$courseDirs{templates}/Library/macros/Dartmouth",
         "$courseDirs{templates}/Library/macros/Mizzou",
         "$courseDirs{templates}/Library/macros/WHFreeman",
         "$courseDirs{templates}/Library/macros/Wiley",
];

Note: there are other macros in the OPL macros directory that are not being used in the OPL. (For example, UW-Stout). These directories should be added to the above list if desired.

@drgrice1 drgrice1 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks good other than a minor indentation issue.

@pstaabp: Note that I rebased this pull request onto develop. So make sure to reset your local branch. It had a duplicate of one of the commits in #1792 in it that wasn't quite the same as that one.

Comment thread conf/defaults.config Outdated
Comment on lines +1118 to +1127
"$pg{directories}{macros}/answers",
"$pg{directories}{macros}/capa",
"$pg{directories}{macros}/contexts",
"$pg{directories}{macros}/core",
"$pg{directories}{macros}/graph",
"$pg{directories}{macros}/math",
"$pg{directories}{macros}/misc",
"$pg{directories}{macros}/parsers",
"$pg{directories}{macros}/ui",
"$courseDirs{templates}/Library/macros/univ",

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

There seems to be an inconsistency in the indentation here. All of these lines should be at the same indent level.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

It was a mix of tabs and spaces. We need to do a perltidy of webwork2.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Agreed!

@drgrice1 drgrice1 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Once openwebwork/pg#724 goes in, this is ready to go also.

@pstaabp pstaabp force-pushed the move-opl-macros branch 2 times, most recently from a4c4136 to fd6aae2 Compare November 2, 2022 19:34
@drgrice1 drgrice1 merged commit a478ef7 into openwebwork:develop Dec 21, 2022
@pstaabp pstaabp deleted the move-opl-macros branch January 4, 2023 13:59
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