Skip to content

Commit

Permalink
TDEAL-2: documentation update. (#378)
Browse files Browse the repository at this point in the history
* Define the Lombiq paths in the parent submodule.

* Add documentation about using submodules.

* Fix Contributors.
  • Loading branch information
sarahelsaig authored Nov 14, 2023
1 parent 076b2b8 commit 6b89d9d
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"contributorsPerLine": 6,
"contributors": [
{
"login": "DAud-IcI",
"name": "Dávid El-Saig",
"login": "sarahelsaig",
"name": "Sára El-Saig",
"avatar_url": "https://avatars.githubusercontent.com/u/4007293?v=4",
"profile": "https://github.com/DAud-IcI",
"profile": "https://github.com/sarahelsaig",
"contributions": [
"code",
"doc"
Expand Down
2 changes: 1 addition & 1 deletion Contributors.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<!-- markdownlint-disable -->
<table>
<tr>
<td align="center"><a href="https://github.com/DAud-IcI"><img src="https://avatars.githubusercontent.com/u/4007293?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dávid El-Saig</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore.Commerce/commits?author=DAud-IcI" title="Code">💻</a> <a href="https://github.com/OrchardCMS/OrchardCore.Commerce/commits?author=DAud-IcI" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/sarahelsaig"><img src="https://avatars.githubusercontent.com/u/4007293?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sára El-Saig</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore.Commerce/commits?author=sarahelsaig" title="Code">💻</a> <a href="https://github.com/OrchardCMS/OrchardCore.Commerce/commits?author=sarahelsaig" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/DemeSzabolcs"><img src="https://avatars.githubusercontent.com/u/80963259?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Szabolcs Deme</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore.Commerce/commits?author=DemeSzabolcs" title="Code">💻</a></td>
<td align="center"><a href="http://bertrandleroy.net/"><img src="https://avatars.githubusercontent.com/u/1165609?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bertrand Le Roy</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore.Commerce/commits?author=bleroy" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/Psichorex"><img src="https://avatars.githubusercontent.com/u/92299130?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roland Márkus</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore.Commerce/commits?author=Psichorex" title="Code">💻</a></td>
Expand Down
4 changes: 4 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@
DestinationFiles="$(ProjectDir)OrchardCoreIcon.png"
SkipUnchangedFiles="true" />
</Target>

<!-- Inherit parent props file if one exists. -->
<Import Condition="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')) != ''"
Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
</Project>
13 changes: 12 additions & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,18 @@ See the [discussions page](https://github.com/OrchardCMS/OrchardCore.Commerce/di

### Pre-requisites

This project uses `Lombiq Node.js Extensions` to compile and lint client-side assets. See its pre-requisites [here](https://github.com/Lombiq/NodeJs-Extensions/tree/dev#pre-requisites).
This project uses [`Lombiq Node.js Extensions`](https://github.com/Lombiq/NodeJs-Extensions) to compile and lint client-side assets. See its pre-requisites [here](https://github.com/Lombiq/NodeJs-Extensions/tree/dev#pre-requisites).

If you want to include OrchardCore.Commerce as a git submodule instead of NuGet package, include the [`Lombiq Helpful Libraries`](https://github.com/Lombiq/Helpful-Libraries/) and `Lombiq Node.js Extensions` submodules as well. In your solution directory create a _Directory.Build.props_ file if one doesn't exist. This should contain the properties that configure the path to the _Lombiq.HelpfulLibraries.OrchardCore.csproj_ file and the _Lombiq.NodeJs.Extensions_ project directory. For example:

```xml
<Project>
<PropertyGroup>
<LombiqHelpfulLibrariesPath>$(MSBuildThisFileDirectory)/src/Libraries/Lombiq.HelpfulLibraries/Lombiq.HelpfulLibraries.OrchardCore/Lombiq.HelpfulLibraries.OrchardCore.csproj</LombiqHelpfulLibrariesPath>
<LombiqNodeJsExtensionsPath>$(MSBuildThisFileDirectory)/src/Utilities/Lombiq.NodeJs.Extensions/Lombiq.NodeJs.Extensions</LombiqNodeJsExtensionsPath>
</PropertyGroup>
</Project>
```

### Setup

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@
<ProjectReference Include="..\..\Libraries\OrchardCore.Commerce.Abstractions\OrchardCore.Commerce.Abstractions.csproj" />
</ItemGroup>

<PropertyGroup>
<LombiqHelpfulLibrariesPath>..\..\..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj</LombiqHelpfulLibrariesPath>
</PropertyGroup>

<ItemGroup Condition="Exists($(LombiqHelpfulLibrariesPath))">
<ProjectReference Include="$(LombiqHelpfulLibrariesPath)" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
<PackageReference Include="OrchardCore.Module.Targets" Version="1.7.0" />
</ItemGroup>

<PropertyGroup>
<LombiqHelpfulLibrariesPath>..\..\..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj</LombiqHelpfulLibrariesPath>
</PropertyGroup>

<ItemGroup Condition="Exists($(LombiqHelpfulLibrariesPath))">
<ProjectReference Include="$(LombiqHelpfulLibrariesPath)" />
</ItemGroup>
Expand Down

0 comments on commit 6b89d9d

Please sign in to comment.