Skip to content

Commit fd6b8cc

Browse files
JeromeMartinezJeromeMartinez
authored
Merge pull request #815 from g-maxime/sign
Windows build scripts
2 parents 5823658 + 5236afb commit fd6b8cc

34 files changed

Lines changed: 1317 additions & 432 deletions

‎.github/workflows/MediaConch_Checks.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
pip --disable-pip-version-check install git+https://github.com/vi/mkvparse.git
2727
fi
2828
if [ "$RUNNER_OS" == "macOS" ]; then
29-
brew install libtool automake libxslt jansson qt@5 sfk xmlstarlet ffmpeg
29+
brew install libtool automake libxslt jansson qt sfk xmlstarlet ffmpeg
3030
sudo pip --disable-pip-version-check install --prefix /usr/local git+https://github.com/vi/mkvparse.git
3131
fi
3232
- name: Get ZenLib info
@@ -89,8 +89,8 @@ jobs:
8989
- name: Configure GUI
9090
run: |
9191
cd Project/Qt
92-
export PATH=/opt/homebrew/opt/qt@5/bin:$PATH
93-
./prepare CONFIG+=c++11 -after QMAKE_MACOSX_DEPLOYMENT_TARGET=10.9 QMAKE_LFLAGS-=-Wl,-ld_classic
92+
export PATH=/opt/homebrew/opt/qt/bin:$PATH
93+
./prepare -after QMAKE_MACOSX_DEPLOYMENT_TARGET=11.0
9494
- name: Build GUI
9595
run: |
9696
cd Project/Qt

‎Project/GNU/CLI/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ mediaconch_SOURCES = \
4646
../../../Source/Checker/Checker.cpp \
4747
../../../Source/Checker/Path.cpp \
4848
../../../Source/IMSC1/IMSC1Plugin.cpp \
49-
../../../Source/ThirdParty/tfsxml/tfsxml.cpp
49+
../../../Source/ThirdParty/tfsxml/tfsxml_wrapper.cpp
5050

5151
#mediaconch_LDFLAGS = -no-undefined -version-info 0:0:0
5252
mediaconch_CPPFLAGS = $(XML_CFLAGS)

‎Project/GNU/Library/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ lib@MediaConchLib_LibName@_la_SOURCES = \
4343
../../../Source/Checker/Checker.cpp \
4444
../../../Source/Checker/Path.cpp \
4545
../../../Source/IMSC1/IMSC1Plugin.cpp \
46-
../../../Source/ThirdParty/tfsxml/tfsxml.cpp
46+
../../../Source/ThirdParty/tfsxml/tfsxml_wrapper.cpp
4747

4848
#lib@MediaConchLib_LibName@includedir = $(includedir)/MediaConch
4949
#lib@MediaConchLib_LibName@include_HEADERS = \

‎Project/GNU/Server/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ mediaconchd_SOURCES = \
4545
../../../Source/Checker/Checker.cpp \
4646
../../../Source/Checker/Path.cpp \
4747
../../../Source/IMSC1/IMSC1Plugin.cpp \
48-
../../../Source/ThirdParty/tfsxml/tfsxml.cpp
48+
../../../Source/ThirdParty/tfsxml/tfsxml_wrapper.cpp
4949

5050
#mediaconchd_LDFLAGS = -no-undefined -version-info 0:0:0
5151
mediaconchd_CPPFLAGS = $(XML_CFLAGS)

‎Project/MSVC2022/CLI/MediaConch.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
<ClCompile Include="..\..\..\Source\Checker\Checker.cpp" />
187187
<ClCompile Include="..\..\..\Source\Checker\Path.cpp" />
188188
<ClCompile Include="..\..\..\Source\IMSC1\IMSC1Plugin.cpp" />
189-
<ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml.cpp" />
189+
<ClCompile Include="..\..\..\Source\ThirdParty\tfsxml\tfsxml_wrapper.cpp" />
190190
<ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c" />
191191
</ItemGroup>
192192
<ItemGroup>

‎Project/MSVC2022/DLL/MediaConch-DLL.vcxproj‎

Lines changed: 309 additions & 0 deletions
Large diffs are not rendered by default.

‎Project/MSVC2022/DLL/MediaConch-DLL.vcxproj.filters‎

Lines changed: 332 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,332 @@
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;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Source Files\Lib">
9+
<UniqueIdentifier>{3ae77992-ac1e-4f84-9b70-b9b52ce3b46a}</UniqueIdentifier>
10+
</Filter>
11+
<Filter Include="Source Files\Common">
12+
<UniqueIdentifier>{04e8d873-200e-44c5-843e-432f681438f8}</UniqueIdentifier>
13+
</Filter>
14+
<Filter Include="Header Files">
15+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
16+
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
17+
</Filter>
18+
<Filter Include="Header Files\Lib">
19+
<UniqueIdentifier>{4144b785-9e42-4b50-b521-d1f949969234}</UniqueIdentifier>
20+
</Filter>
21+
<Filter Include="Header Files\Common">
22+
<UniqueIdentifier>{0e3aa0e0-c270-4d91-87ae-50c30aad50c0}</UniqueIdentifier>
23+
</Filter>
24+
<Filter Include="Resource Files">
25+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
26+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
27+
</Filter>
28+
<Filter Include="ThirdParty">
29+
<UniqueIdentifier>{17d3f297-ae83-44c2-be09-2e2882b1565a}</UniqueIdentifier>
30+
</Filter>
31+
<Filter Include="ThirdParty\sqlite">
32+
<UniqueIdentifier>{3c62d1d8-29ba-45c4-8828-7a5e54664aa9}</UniqueIdentifier>
33+
</Filter>
34+
</ItemGroup>
35+
<ItemGroup>
36+
<ClCompile Include="..\..\..\Source\Lib\Lib.cpp">
37+
<Filter>Source Files\Lib</Filter>
38+
</ClCompile>
39+
<ClCompile Include="..\..\..\Source\Lib\MediaConchDLL.cpp">
40+
<Filter>Source Files\Lib</Filter>
41+
</ClCompile>
42+
<ClCompile Include="..\..\..\Source\Common\Core.cpp">
43+
<Filter>Source Files\Common</Filter>
44+
</ClCompile>
45+
<ClCompile Include="..\..\..\Source\Common\Xslt.cpp">
46+
<Filter>Source Files\Common</Filter>
47+
</ClCompile>
48+
<ClCompile Include="..\..\..\Source\Common\Schema.cpp">
49+
<Filter>Source Files\Common</Filter>
50+
</ClCompile>
51+
<ClCompile Include="..\..\..\Source\Common\JS_Tree.cpp">
52+
<Filter>Source Files\Common</Filter>
53+
</ClCompile>
54+
<ClCompile Include="..\..\..\Source\Common\Policy.cpp">
55+
<Filter>Source Files\Common</Filter>
56+
</ClCompile>
57+
<ClCompile Include="..\..\..\Source\Common\XsltPolicy.cpp">
58+
<Filter>Source Files\Common</Filter>
59+
</ClCompile>
60+
<ClCompile Include="..\..\..\Source\Common\Policies.cpp">
61+
<Filter>Source Files\Common</Filter>
62+
</ClCompile>
63+
<ClCompile Include="..\..\..\Source\Common\Configuration.cpp">
64+
<Filter>Source Files\Common</Filter>
65+
</ClCompile>
66+
<ClCompile Include="..\..\..\Source\Common\DaemonClient.cpp">
67+
<Filter>Source Files\Common</Filter>
68+
</ClCompile>
69+
<ClCompile Include="..\..\..\Source\Common\Database.cpp">
70+
<Filter>Source Files\Common</Filter>
71+
</ClCompile>
72+
<ClCompile Include="..\..\..\Source\Common\Http.cpp">
73+
<Filter>Source Files\Common</Filter>
74+
</ClCompile>
75+
<ClCompile Include="..\..\..\Source\Common\Httpd.cpp">
76+
<Filter>Source Files\Common</Filter>
77+
</ClCompile>
78+
<ClCompile Include="..\..\..\Source\Common\Json.cpp">
79+
<Filter>Source Files\Common</Filter>
80+
</ClCompile>
81+
<ClCompile Include="..\..\..\Source\Common\LibEventHttp.cpp">
82+
<Filter>Source Files\Common</Filter>
83+
</ClCompile>
84+
<ClCompile Include="..\..\..\Source\Common\LibEventHttpd.cpp">
85+
<Filter>Source Files\Common</Filter>
86+
</ClCompile>
87+
<ClCompile Include="..\..\..\Source\Common\MediaConchLib.cpp">
88+
<Filter>Source Files\Common</Filter>
89+
</ClCompile>
90+
<ClCompile Include="..\..\..\Source\Common\Queue.cpp">
91+
<Filter>Source Files\Common</Filter>
92+
</ClCompile>
93+
<ClCompile Include="..\..\..\Source\Common\REST_API.cpp">
94+
<Filter>Source Files\Common</Filter>
95+
</ClCompile>
96+
<ClCompile Include="..\..\..\Source\Common\Scheduler.cpp">
97+
<Filter>Source Files\Common</Filter>
98+
</ClCompile>
99+
<ClCompile Include="..\..\..\Source\Common\SQLLite.cpp">
100+
<Filter>Source Files\Common</Filter>
101+
</ClCompile>
102+
<ClCompile Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.c">
103+
<Filter>ThirdParty\sqlite</Filter>
104+
</ClCompile>
105+
<ClCompile Include="..\..\..\Source\Common\UnknownPolicy.cpp">
106+
<Filter>Source Files\Common</Filter>
107+
</ClCompile>
108+
<ClCompile Include="..\..\..\Source\Common\DpfManager.cpp">
109+
<Filter>Source Files\Common</Filter>
110+
</ClCompile>
111+
<ClCompile Include="..\..\..\Source\Common\Plugin.cpp">
112+
<Filter>Source Files\Common</Filter>
113+
</ClCompile>
114+
<ClCompile Include="..\..\..\Source\Common\PluginsConfig.cpp">
115+
<Filter>Source Files\Common</Filter>
116+
</ClCompile>
117+
<ClCompile Include="..\..\..\Source\Common\PluginsManager.cpp">
118+
<Filter>Source Files\Common</Filter>
119+
</ClCompile>
120+
<ClCompile Include="..\..\..\Source\Common\VeraPDF.cpp">
121+
<Filter>Source Files\Common</Filter>
122+
</ClCompile>
123+
<ClCompile Include="..\..\..\Source\Common\DatabaseReport.cpp">
124+
<Filter>Source Files\Common</Filter>
125+
</ClCompile>
126+
<ClCompile Include="..\..\..\Source\Common\NoDatabaseReport.cpp">
127+
<Filter>Source Files\Common</Filter>
128+
</ClCompile>
129+
<ClCompile Include="..\..\..\Source\Common\SQLLiteReport.cpp">
130+
<Filter>Source Files\Common</Filter>
131+
</ClCompile>
132+
<ClCompile Include="..\..\..\Source\Common\PluginFileLog.cpp">
133+
<Filter>Source Files\Common</Filter>
134+
</ClCompile>
135+
<ClCompile Include="..\..\..\Source\Common\WatchFolder.cpp">
136+
<Filter>Source Files\Common</Filter>
137+
</ClCompile>
138+
<ClCompile Include="..\..\..\Source\Common\WatchFoldersManager.cpp">
139+
<Filter>Source Files\Common</Filter>
140+
</ClCompile>
141+
<ClCompile Include="..\..\..\Source\Common\PluginPreHook.cpp">
142+
<Filter>Source Files\Common</Filter>
143+
</ClCompile>
144+
<ClCompile Include="..\..\..\Source\Common\Reports.cpp">
145+
<Filter>Source Files\Common</Filter>
146+
</ClCompile>
147+
</ItemGroup>
148+
<ItemGroup>
149+
<ClInclude Include="..\..\..\Source\Lib\Lib.h">
150+
<Filter>Header Files\Lib</Filter>
151+
</ClInclude>
152+
<ClInclude Include="..\..\..\Source\Lib\MediaConchDLL.h">
153+
<Filter>Header Files\Lib</Filter>
154+
</ClInclude>
155+
<ClInclude Include="..\..\..\Source\Common\Core.h">
156+
<Filter>Header Files\Common</Filter>
157+
</ClInclude>
158+
<ClInclude Include="..\..\..\Source\Common\Policies.h">
159+
<Filter>Header Files\Common</Filter>
160+
</ClInclude>
161+
<ClInclude Include="..\..\..\Source\Common\Policy.h">
162+
<Filter>Header Files\Common</Filter>
163+
</ClInclude>
164+
<ClInclude Include="..\..\..\Source\Common\XsltPolicy.h">
165+
<Filter>Header Files\Common</Filter>
166+
</ClInclude>
167+
<ClInclude Include="..\..\..\Source\ThirdParty\sqlite\sqlite3.h">
168+
<Filter>ThirdParty\sqlite</Filter>
169+
</ClInclude>
170+
<ClInclude Include="..\..\..\Source\Common\UnknownPolicy.h">
171+
<Filter>Header Files\Common</Filter>
172+
</ClInclude>
173+
<ClInclude Include="..\..\..\Source\Common\DpfManager.h">
174+
<Filter>Header Files\Common</Filter>
175+
</ClInclude>
176+
<ClInclude Include="..\..\..\Source\Common\Plugin.h">
177+
<Filter>Header Files\Common</Filter>
178+
</ClInclude>
179+
<ClInclude Include="..\..\..\Source\Common\PluginFormat.h">
180+
<Filter>Header Files\Common</Filter>
181+
</ClInclude>
182+
<ClInclude Include="..\..\..\Source\Common\PluginsConfig.h">
183+
<Filter>Header Files\Common</Filter>
184+
</ClInclude>
185+
<ClInclude Include="..\..\..\Source\Common\PluginsManager.h">
186+
<Filter>Header Files\Common</Filter>
187+
</ClInclude>
188+
<ClInclude Include="..\..\..\Source\Common\VeraPDF.h">
189+
<Filter>Header Files\Common</Filter>
190+
</ClInclude>
191+
<ClInclude Include="..\..\..\Source\Common\DatabaseReport.h">
192+
<Filter>Header Files\Common</Filter>
193+
</ClInclude>
194+
<ClInclude Include="..\..\..\Source\Common\Configuration.h">
195+
<Filter>Header Files\Common</Filter>
196+
</ClInclude>
197+
<ClInclude Include="..\..\..\Source\Common\Container.h">
198+
<Filter>Header Files\Common</Filter>
199+
</ClInclude>
200+
<ClInclude Include="..\..\..\Source\Common\DaemonClient.h">
201+
<Filter>Header Files\Common</Filter>
202+
</ClInclude>
203+
<ClInclude Include="..\..\..\Source\Common\Database.h">
204+
<Filter>Header Files\Common</Filter>
205+
</ClInclude>
206+
<ClInclude Include="..\..\..\Source\Common\FileRegistered.h">
207+
<Filter>Header Files\Common</Filter>
208+
</ClInclude>
209+
<ClInclude Include="..\..\..\Source\Common\Http.h">
210+
<Filter>Header Files\Common</Filter>
211+
</ClInclude>
212+
<ClInclude Include="..\..\..\Source\Common\Httpd.h">
213+
<Filter>Header Files\Common</Filter>
214+
</ClInclude>
215+
<ClInclude Include="..\..\..\Source\Common\JS_Tree.h">
216+
<Filter>Header Files\Common</Filter>
217+
</ClInclude>
218+
<ClInclude Include="..\..\..\Source\Common\Json.h">
219+
<Filter>Header Files\Common</Filter>
220+
</ClInclude>
221+
<ClInclude Include="..\..\..\Source\Common\LibEventHttp.h">
222+
<Filter>Header Files\Common</Filter>
223+
</ClInclude>
224+
<ClInclude Include="..\..\..\Source\Common\LibEventHttpd.h">
225+
<Filter>Header Files\Common</Filter>
226+
</ClInclude>
227+
<ClInclude Include="..\..\..\Source\Common\MediaConchLib.h">
228+
<Filter>Header Files\Common</Filter>
229+
</ClInclude>
230+
<ClInclude Include="..\..\..\Source\Common\NoContainer.h">
231+
<Filter>Header Files\Common</Filter>
232+
</ClInclude>
233+
<ClInclude Include="..\..\..\Source\Common\NoDatabaseReport.h">
234+
<Filter>Header Files\Common</Filter>
235+
</ClInclude>
236+
<ClInclude Include="..\..\..\Source\Common\PluginFileLog.h">
237+
<Filter>Header Files\Common</Filter>
238+
</ClInclude>
239+
<ClInclude Include="..\..\..\Source\Common\PluginLog.h">
240+
<Filter>Header Files\Common</Filter>
241+
</ClInclude>
242+
<ClInclude Include="..\..\..\Source\Common\PluginPreHook.h">
243+
<Filter>Header Files\Common</Filter>
244+
</ClInclude>
245+
<ClInclude Include="..\..\..\Source\Common\Queue.h">
246+
<Filter>Header Files\Common</Filter>
247+
</ClInclude>
248+
<ClInclude Include="..\..\..\Source\Common\REST_API.h">
249+
<Filter>Header Files\Common</Filter>
250+
</ClInclude>
251+
<ClInclude Include="..\..\..\Source\Common\Scheduler.h">
252+
<Filter>Header Files\Common</Filter>
253+
</ClInclude>
254+
<ClInclude Include="..\..\..\Source\Common\Schema.h">
255+
<Filter>Header Files\Common</Filter>
256+
</ClInclude>
257+
<ClInclude Include="..\..\..\Source\Common\SQLLite.h">
258+
<Filter>Header Files\Common</Filter>
259+
</ClInclude>
260+
<ClInclude Include="..\..\..\Source\Common\SQLLiteReport.h">
261+
<Filter>Header Files\Common</Filter>
262+
</ClInclude>
263+
<ClInclude Include="..\..\..\Source\Common\WatchFolder.h">
264+
<Filter>Header Files\Common</Filter>
265+
</ClInclude>
266+
<ClInclude Include="..\..\..\Source\Common\WatchFoldersManager.h">
267+
<Filter>Header Files\Common</Filter>
268+
</ClInclude>
269+
<ClInclude Include="..\..\..\Source\Common\Xslt.h">
270+
<Filter>Header Files\Common</Filter>
271+
</ClInclude>
272+
<ClInclude Include="..\..\..\Source\Common\generated\GeneratedCSVVideos.h">
273+
<Filter>Header Files\Common</Filter>
274+
</ClInclude>
275+
<ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayHtmlXsl.h">
276+
<Filter>Header Files\Common</Filter>
277+
</ClInclude>
278+
<ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextUnicodeXsl.h">
279+
<Filter>Header Files\Common</Filter>
280+
</ClInclude>
281+
<ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDisplayTextXsl.h">
282+
<Filter>Header Files\Common</Filter>
283+
</ClInclude>
284+
<ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportDPFManagerXsl.h">
285+
<Filter>Header Files\Common</Filter>
286+
</ClInclude>
287+
<ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportMatroskaSchema.h">
288+
<Filter>Header Files\Common</Filter>
289+
</ClInclude>
290+
<ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportVeraPDFXsl.h">
291+
<Filter>Header Files\Common</Filter>
292+
</ClInclude>
293+
<ClInclude Include="..\..\..\Source\Common\generated\ImplementationReportXsl.h">
294+
<Filter>Header Files\Common</Filter>
295+
</ClInclude>
296+
<ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayHtmlXsl.h">
297+
<Filter>Header Files\Common</Filter>
298+
</ClInclude>
299+
<ClInclude Include="..\..\..\Source\Common\generated\MediaTraceDisplayTextXsl.h">
300+
<Filter>Header Files\Common</Filter>
301+
</ClInclude>
302+
<ClInclude Include="..\..\..\Source\Common\generated\MicroMediaTraceToMediaTraceXsl.h">
303+
<Filter>Header Files\Common</Filter>
304+
</ClInclude>
305+
<ClInclude Include="..\..\..\Source\Common\generated\PolicySample1.h">
306+
<Filter>Header Files\Common</Filter>
307+
</ClInclude>
308+
<ClInclude Include="..\..\..\Source\Common\generated\PolicySample4.h">
309+
<Filter>Header Files\Common</Filter>
310+
</ClInclude>
311+
<ClInclude Include="..\..\..\Source\Common\generated\PolicySample5.h">
312+
<Filter>Header Files\Common</Filter>
313+
</ClInclude>
314+
<ClInclude Include="..\..\..\Source\Common\generated\PolicySample6.h">
315+
<Filter>Header Files\Common</Filter>
316+
</ClInclude>
317+
<ClInclude Include="..\..\..\Source\Common\generated\PolicySample7.h">
318+
<Filter>Header Files\Common</Filter>
319+
</ClInclude>
320+
<ClInclude Include="..\..\..\Source\Common\generated\PolicyTransformXml.h">
321+
<Filter>Header Files\Common</Filter>
322+
</ClInclude>
323+
<ClInclude Include="..\..\..\Source\Common\Reports.h">
324+
<Filter>Header Files\Common</Filter>
325+
</ClInclude>
326+
</ItemGroup>
327+
<ItemGroup>
328+
<ResourceCompile Include="MediaConch_DLL.rc">
329+
<Filter>Resource Files</Filter>
330+
</ResourceCompile>
331+
</ItemGroup>
332+
</Project>

0 commit comments

Comments
 (0)