Skip to content

Commit 99d801c

Browse files
SinghRajenMSinghRajenM
committed
Rearranging code structure - Fix builds issues
1 parent 679a676 commit 99d801c

File tree

3 files changed

+172
-172
lines changed

3 files changed

+172
-172
lines changed

‎.github/workflows/ci_build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ jobs:
2626
uses: microsoft/setup-msbuild@v2
2727

2828
- name: Build
29-
working-directory: NppJSONViewer
29+
working-directory: src
3030
run: msbuild NppJSONViewer.sln /m /p:configuration="${{ matrix.build_configuration }}" /p:platform="${{ matrix.build_platform }}" /p:PlatformToolset="v143"
3131

3232
- name: Archive binaries artifacts
3333
uses: actions/upload-artifact@v3
3434
with:
3535
name: ${{ matrix.build_platform}}_${{ matrix.build_configuration}}
36-
path: NppJSONViewer\Build\Bin\${{ matrix.build_configuration}}\${{ matrix.build_platform}}\NPPJSONViewer.dll
36+
path: src\Build\Bin\${{ matrix.build_configuration}}\${{ matrix.build_platform}}\NPPJSONViewer.dll
3737

3838
- name: Archive symbols artifacts
3939
uses: actions/upload-artifact@v3
4040
with:
4141
name: ${{ matrix.build_platform}}_${{ matrix.build_configuration}}_pdb
42-
path: NppJSONViewer\Build\Bin\${{ matrix.build_configuration}}\${{ matrix.build_platform}}\NPPJSONViewer.pdb
42+
path: src\Build\Bin\${{ matrix.build_configuration}}\${{ matrix.build_platform}}\NPPJSONViewer.pdb
4343

4444

‎src/NppJsonViewer/NPPJSONViewer.vcxproj

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -114,27 +114,27 @@
114114
</PropertyGroup>
115115
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
116116
<IncludePath>$(SolutionDir)UtilityLib;$(IncludePath)</IncludePath>
117-
<ExternalIncludePath>$(SolutionDir)external\npp;$(SolutionDir)external\rapidjson\include;$(ExternalIncludePath)</ExternalIncludePath>
117+
<ExternalIncludePath>$(SolutionDir)..\external\npp;$(SolutionDir)..\external\rapidjson\include;$(ExternalIncludePath)</ExternalIncludePath>
118118
</PropertyGroup>
119119
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
120120
<IncludePath>$(SolutionDir)UtilityLib;$(IncludePath)</IncludePath>
121-
<ExternalIncludePath>$(SolutionDir)external\npp;$(SolutionDir)external\rapidjson\include;$(ExternalIncludePath)</ExternalIncludePath>
121+
<ExternalIncludePath>$(SolutionDir)..\external\npp;$(SolutionDir)..\external\rapidjson\include;$(ExternalIncludePath)</ExternalIncludePath>
122122
</PropertyGroup>
123123
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
124124
<IncludePath>$(SolutionDir)UtilityLib;$(IncludePath)</IncludePath>
125-
<ExternalIncludePath>$(SolutionDir)external\npp;$(SolutionDir)external\rapidjson\include;$(ExternalIncludePath)</ExternalIncludePath>
125+
<ExternalIncludePath>$(SolutionDir)..\external\npp;$(SolutionDir)..\external\rapidjson\include;$(ExternalIncludePath)</ExternalIncludePath>
126126
</PropertyGroup>
127127
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
128128
<IncludePath>$(SolutionDir)UtilityLib;$(IncludePath)</IncludePath>
129-
<ExternalIncludePath>$(SolutionDir)external\npp;$(SolutionDir)external\rapidjson\include;$(ExternalIncludePath)</ExternalIncludePath>
129+
<ExternalIncludePath>$(SolutionDir)..\external\npp;$(SolutionDir)..\external\rapidjson\include;$(ExternalIncludePath)</ExternalIncludePath>
130130
</PropertyGroup>
131131
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
132132
<IncludePath>$(SolutionDir)UtilityLib;$(IncludePath)</IncludePath>
133-
<ExternalIncludePath>$(SolutionDir)external\npp;$(SolutionDir)external\rapidjson\include;$(ExternalIncludePath)</ExternalIncludePath>
133+
<ExternalIncludePath>$(SolutionDir)..\external\npp;$(SolutionDir)..\external\rapidjson\include;$(ExternalIncludePath)</ExternalIncludePath>
134134
</PropertyGroup>
135135
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
136136
<IncludePath>$(SolutionDir)UtilityLib;$(IncludePath)</IncludePath>
137-
<ExternalIncludePath>$(SolutionDir)external\npp;$(SolutionDir)external\rapidjson\include;$(ExternalIncludePath)</ExternalIncludePath>
137+
<ExternalIncludePath>$(SolutionDir)..\external\npp;$(SolutionDir)..\external\rapidjson\include;$(ExternalIncludePath)</ExternalIncludePath>
138138
</PropertyGroup>
139139
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
140140
<ClCompile>
@@ -270,7 +270,7 @@
270270
</Link>
271271
</ItemDefinitionGroup>
272272
<ItemGroup>
273-
<ClCompile Include="..\external\npp\StaticDialog.cpp" />
273+
<ClCompile Include="..\..\external\npp\StaticDialog.cpp" />
274274
<ClCompile Include="AboutDlg.cpp" />
275275
<ClCompile Include="dllmain.cpp" />
276276
<ClCompile Include="JsonHandler.cpp" />
@@ -284,15 +284,15 @@
284284
<ClCompile Include="TreeViewCtrl.cpp" />
285285
</ItemGroup>
286286
<ItemGroup>
287-
<ClInclude Include="..\external\npp\Docking.h" />
288-
<ClInclude Include="..\external\npp\DockingDlgInterface.h" />
289-
<ClInclude Include="..\external\npp\dockingResource.h" />
290-
<ClInclude Include="..\external\npp\menuCmdID.h" />
291-
<ClInclude Include="..\external\npp\Notepad_plus_msgs.h" />
292-
<ClInclude Include="..\external\npp\PluginInterface.h" />
293-
<ClInclude Include="..\external\npp\Scintilla.h" />
294-
<ClInclude Include="..\external\npp\StaticDialog.h" />
295-
<ClInclude Include="..\external\npp\Window.h" />
287+
<ClInclude Include="..\..\external\npp\Docking.h" />
288+
<ClInclude Include="..\..\external\npp\DockingDlgInterface.h" />
289+
<ClInclude Include="..\..\external\npp\dockingResource.h" />
290+
<ClInclude Include="..\..\external\npp\menuCmdID.h" />
291+
<ClInclude Include="..\..\external\npp\Notepad_plus_msgs.h" />
292+
<ClInclude Include="..\..\external\npp\PluginInterface.h" />
293+
<ClInclude Include="..\..\external\npp\Scintilla.h" />
294+
<ClInclude Include="..\..\external\npp\StaticDialog.h" />
295+
<ClInclude Include="..\..\external\npp\Window.h" />
296296
<ClInclude Include="AboutDlg.h" />
297297
<ClInclude Include="Define.h" />
298298
<ClInclude Include="JsonHandler.h" />

‎src/NppJsonViewer/NPPJSONViewer.vcxproj.filters

Lines changed: 153 additions & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -1,154 +1,154 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup>
4-
<Filter Include="Source Files">
5-
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6-
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7-
</Filter>
8-
<Filter Include="Header Files">
9-
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10-
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
11-
</Filter>
12-
<Filter Include="Resource Files">
13-
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14-
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
15-
</Filter>
16-
<Filter Include="ThirdParty">
17-
<UniqueIdentifier>{3a31aa3c-9f15-4a33-bf5c-b9153d1e757a}</UniqueIdentifier>
18-
</Filter>
19-
<Filter Include="ThirdParty\npp">
20-
<UniqueIdentifier>{5b794f9e-baf6-4faf-98a6-741b4918d410}</UniqueIdentifier>
21-
</Filter>
22-
</ItemGroup>
23-
<ItemGroup>
24-
<ClCompile Include="dllmain.cpp">
25-
<Filter>Source Files</Filter>
26-
</ClCompile>
27-
<ClCompile Include="..\external\npp\StaticDialog.cpp">
28-
<Filter>ThirdParty\npp</Filter>
29-
</ClCompile>
30-
<ClCompile Include="NppJsonPlugin.cpp">
31-
<Filter>Source Files</Filter>
32-
</ClCompile>
33-
<ClCompile Include="ShortcutCommand.cpp">
34-
<Filter>Source Files</Filter>
35-
</ClCompile>
36-
<ClCompile Include="JsonViewDlg.cpp">
37-
<Filter>Source Files</Filter>
38-
</ClCompile>
39-
<ClCompile Include="ScintillaEditor.cpp">
40-
<Filter>Source Files</Filter>
41-
</ClCompile>
42-
<ClCompile Include="TreeViewCtrl.cpp">
43-
<Filter>Source Files</Filter>
44-
</ClCompile>
45-
<ClCompile Include="AboutDlg.cpp">
46-
<Filter>Source Files</Filter>
47-
</ClCompile>
48-
<ClCompile Include="JsonHandler.cpp">
49-
<Filter>Source Files</Filter>
50-
</ClCompile>
51-
<ClCompile Include="RapidJsonHandler.cpp">
52-
<Filter>Source Files</Filter>
53-
</ClCompile>
54-
<ClCompile Include="SettingsDlg.cpp">
55-
<Filter>Source Files</Filter>
56-
</ClCompile>
57-
<ClCompile Include="Profile.cpp">
58-
<Filter>Source Files</Filter>
59-
</ClCompile>
60-
</ItemGroup>
61-
<ItemGroup>
62-
<ClInclude Include="resource.h">
63-
<Filter>Header Files</Filter>
64-
</ClInclude>
65-
<ClInclude Include="StopWatch.h">
66-
<Filter>Header Files</Filter>
67-
</ClInclude>
68-
<ClInclude Include="..\external\npp\Docking.h">
69-
<Filter>ThirdParty\npp</Filter>
70-
</ClInclude>
71-
<ClInclude Include="..\external\npp\DockingDlgInterface.h">
72-
<Filter>ThirdParty\npp</Filter>
73-
</ClInclude>
74-
<ClInclude Include="..\external\npp\dockingResource.h">
75-
<Filter>ThirdParty\npp</Filter>
76-
</ClInclude>
77-
<ClInclude Include="..\external\npp\menuCmdID.h">
78-
<Filter>ThirdParty\npp</Filter>
79-
</ClInclude>
80-
<ClInclude Include="..\external\npp\Notepad_plus_msgs.h">
81-
<Filter>ThirdParty\npp</Filter>
82-
</ClInclude>
83-
<ClInclude Include="..\external\npp\PluginInterface.h">
84-
<Filter>ThirdParty\npp</Filter>
85-
</ClInclude>
86-
<ClInclude Include="..\external\npp\Scintilla.h">
87-
<Filter>ThirdParty\npp</Filter>
88-
</ClInclude>
89-
<ClInclude Include="..\external\npp\StaticDialog.h">
90-
<Filter>ThirdParty\npp</Filter>
91-
</ClInclude>
92-
<ClInclude Include="..\external\npp\Window.h">
93-
<Filter>ThirdParty\npp</Filter>
94-
</ClInclude>
95-
<ClInclude Include="NppJsonPlugin.h">
96-
<Filter>Header Files</Filter>
97-
</ClInclude>
98-
<ClInclude Include="ShortcutCommand.h">
99-
<Filter>Header Files</Filter>
100-
</ClInclude>
101-
<ClInclude Include="JsonViewDlg.h">
102-
<Filter>Header Files</Filter>
103-
</ClInclude>
104-
<ClInclude Include="ScintillaEditor.h">
105-
<Filter>Header Files</Filter>
106-
</ClInclude>
107-
<ClInclude Include="TreeViewCtrl.h">
108-
<Filter>Header Files</Filter>
109-
</ClInclude>
110-
<ClInclude Include="AboutDlg.h">
111-
<Filter>Header Files</Filter>
112-
</ClInclude>
113-
<ClInclude Include="Define.h">
114-
<Filter>Header Files</Filter>
115-
</ClInclude>
116-
<ClInclude Include="JsonHandler.h">
117-
<Filter>Header Files</Filter>
118-
</ClInclude>
119-
<ClInclude Include="JsonNode.h">
120-
<Filter>Header Files</Filter>
121-
</ClInclude>
122-
<ClInclude Include="RapidJsonHandler.h">
123-
<Filter>Header Files</Filter>
124-
</ClInclude>
125-
<ClInclude Include="SettingsDlg.h">
126-
<Filter>Header Files</Filter>
127-
</ClInclude>
128-
<ClInclude Include="Profile.h">
129-
<Filter>Header Files</Filter>
130-
</ClInclude>
131-
</ItemGroup>
132-
<ItemGroup>
133-
<ResourceCompile Include="resource.rc">
134-
<Filter>Resource Files</Filter>
135-
</ResourceCompile>
136-
</ItemGroup>
137-
<ItemGroup>
138-
<Image Include="res\Refresh.ico">
139-
<Filter>Resource Files</Filter>
140-
</Image>
141-
<Image Include="res\search.ico">
142-
<Filter>Resource Files</Filter>
143-
</Image>
144-
<Image Include="res\format.ico">
145-
<Filter>Resource Files</Filter>
146-
</Image>
147-
<Image Include="res\validate.ico">
148-
<Filter>Resource Files</Filter>
149-
</Image>
150-
<Image Include="res\Icon.ico">
151-
<Filter>Resource Files</Filter>
152-
</Image>
153-
</ItemGroup>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Header Files">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
11+
</Filter>
12+
<Filter Include="Resource Files">
13+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
15+
</Filter>
16+
<Filter Include="ThirdParty">
17+
<UniqueIdentifier>{3a31aa3c-9f15-4a33-bf5c-b9153d1e757a}</UniqueIdentifier>
18+
</Filter>
19+
<Filter Include="ThirdParty\npp">
20+
<UniqueIdentifier>{5b794f9e-baf6-4faf-98a6-741b4918d410}</UniqueIdentifier>
21+
</Filter>
22+
</ItemGroup>
23+
<ItemGroup>
24+
<ClCompile Include="dllmain.cpp">
25+
<Filter>Source Files</Filter>
26+
</ClCompile>
27+
<ClCompile Include="NppJsonPlugin.cpp">
28+
<Filter>Source Files</Filter>
29+
</ClCompile>
30+
<ClCompile Include="ShortcutCommand.cpp">
31+
<Filter>Source Files</Filter>
32+
</ClCompile>
33+
<ClCompile Include="JsonViewDlg.cpp">
34+
<Filter>Source Files</Filter>
35+
</ClCompile>
36+
<ClCompile Include="ScintillaEditor.cpp">
37+
<Filter>Source Files</Filter>
38+
</ClCompile>
39+
<ClCompile Include="TreeViewCtrl.cpp">
40+
<Filter>Source Files</Filter>
41+
</ClCompile>
42+
<ClCompile Include="AboutDlg.cpp">
43+
<Filter>Source Files</Filter>
44+
</ClCompile>
45+
<ClCompile Include="JsonHandler.cpp">
46+
<Filter>Source Files</Filter>
47+
</ClCompile>
48+
<ClCompile Include="RapidJsonHandler.cpp">
49+
<Filter>Source Files</Filter>
50+
</ClCompile>
51+
<ClCompile Include="SettingsDlg.cpp">
52+
<Filter>Source Files</Filter>
53+
</ClCompile>
54+
<ClCompile Include="Profile.cpp">
55+
<Filter>Source Files</Filter>
56+
</ClCompile>
57+
<ClCompile Include="..\..\external\npp\StaticDialog.cpp">
58+
<Filter>ThirdParty\npp</Filter>
59+
</ClCompile>
60+
</ItemGroup>
61+
<ItemGroup>
62+
<ClInclude Include="resource.h">
63+
<Filter>Header Files</Filter>
64+
</ClInclude>
65+
<ClInclude Include="StopWatch.h">
66+
<Filter>Header Files</Filter>
67+
</ClInclude>
68+
<ClInclude Include="NppJsonPlugin.h">
69+
<Filter>Header Files</Filter>
70+
</ClInclude>
71+
<ClInclude Include="ShortcutCommand.h">
72+
<Filter>Header Files</Filter>
73+
</ClInclude>
74+
<ClInclude Include="JsonViewDlg.h">
75+
<Filter>Header Files</Filter>
76+
</ClInclude>
77+
<ClInclude Include="ScintillaEditor.h">
78+
<Filter>Header Files</Filter>
79+
</ClInclude>
80+
<ClInclude Include="TreeViewCtrl.h">
81+
<Filter>Header Files</Filter>
82+
</ClInclude>
83+
<ClInclude Include="AboutDlg.h">
84+
<Filter>Header Files</Filter>
85+
</ClInclude>
86+
<ClInclude Include="Define.h">
87+
<Filter>Header Files</Filter>
88+
</ClInclude>
89+
<ClInclude Include="JsonHandler.h">
90+
<Filter>Header Files</Filter>
91+
</ClInclude>
92+
<ClInclude Include="JsonNode.h">
93+
<Filter>Header Files</Filter>
94+
</ClInclude>
95+
<ClInclude Include="RapidJsonHandler.h">
96+
<Filter>Header Files</Filter>
97+
</ClInclude>
98+
<ClInclude Include="SettingsDlg.h">
99+
<Filter>Header Files</Filter>
100+
</ClInclude>
101+
<ClInclude Include="Profile.h">
102+
<Filter>Header Files</Filter>
103+
</ClInclude>
104+
<ClInclude Include="..\..\external\npp\Docking.h">
105+
<Filter>ThirdParty\npp</Filter>
106+
</ClInclude>
107+
<ClInclude Include="..\..\external\npp\DockingDlgInterface.h">
108+
<Filter>ThirdParty\npp</Filter>
109+
</ClInclude>
110+
<ClInclude Include="..\..\external\npp\dockingResource.h">
111+
<Filter>ThirdParty\npp</Filter>
112+
</ClInclude>
113+
<ClInclude Include="..\..\external\npp\menuCmdID.h">
114+
<Filter>ThirdParty\npp</Filter>
115+
</ClInclude>
116+
<ClInclude Include="..\..\external\npp\Notepad_plus_msgs.h">
117+
<Filter>ThirdParty\npp</Filter>
118+
</ClInclude>
119+
<ClInclude Include="..\..\external\npp\PluginInterface.h">
120+
<Filter>ThirdParty\npp</Filter>
121+
</ClInclude>
122+
<ClInclude Include="..\..\external\npp\Scintilla.h">
123+
<Filter>ThirdParty\npp</Filter>
124+
</ClInclude>
125+
<ClInclude Include="..\..\external\npp\StaticDialog.h">
126+
<Filter>ThirdParty\npp</Filter>
127+
</ClInclude>
128+
<ClInclude Include="..\..\external\npp\Window.h">
129+
<Filter>ThirdParty\npp</Filter>
130+
</ClInclude>
131+
</ItemGroup>
132+
<ItemGroup>
133+
<ResourceCompile Include="resource.rc">
134+
<Filter>Resource Files</Filter>
135+
</ResourceCompile>
136+
</ItemGroup>
137+
<ItemGroup>
138+
<Image Include="res\Refresh.ico">
139+
<Filter>Resource Files</Filter>
140+
</Image>
141+
<Image Include="res\search.ico">
142+
<Filter>Resource Files</Filter>
143+
</Image>
144+
<Image Include="res\format.ico">
145+
<Filter>Resource Files</Filter>
146+
</Image>
147+
<Image Include="res\validate.ico">
148+
<Filter>Resource Files</Filter>
149+
</Image>
150+
<Image Include="res\Icon.ico">
151+
<Filter>Resource Files</Filter>
152+
</Image>
153+
</ItemGroup>
154154
</Project>

0 commit comments

Comments
 (0)