Revision 112:7d82811c490a

View differences:

.hgignore
52 52
piper-convert
53 53
.repoint*
54 54
glob:.repoint*
55
build_win32
56
build_win64
deploy/win64/README-Vamp.txt
1

  
2
To add 64-bit Vamp audio analysis plugins to the Transform menu in
3
Sonic Visualiser, unpack and copy them into this directory.
4

  
5
(For 32-bit plugins, put them in "C:\Program Files (x86)\Vamp Plugins"
6
instead, or the equivalent in your local language edition of Windows.)
7

  
8
See http://vamp-plugins.org/ for more information.
deploy/win64/build-64-debug.bat
1
rem  Run this from within the top-level SV dir: deploy\win64\build-64.bat
2
rem  To build from clean, delete the folder build_win64_debug first
3

  
4
rem  NB you will probably also have to change the CONFIG in noconfig.pri
5
rem  from release to debug
6

  
7
echo on
8

  
9
set STARTPWD=%CD%
10

  
11
set QTDIR=C:\Qt\5.11.2\msvc2017_64
12
if not exist %QTDIR% (
13
@   echo Could not find 64-bit Qt
14
@   exit /b 2
15
)
16

  
17
if not exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" (
18
@   echo "Could not find MSVC vars batch file"
19
@   exit /b 2
20
)
21

  
22
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
23

  
24
set ORIGINALPATH=%PATH%
25
set PATH=%PATH%;C:\Program Files (x86)\SMLNJ\bin;%QTDIR%\bin
26

  
27
cd %STARTPWD%
28

  
29
call .\repoint install
30
if %errorlevel% neq 0 exit /b %errorlevel%
31

  
32
sv-dependency-builds\win64-msvc\bin\capnp -Isv-dependency-builds/win64-msvc/include compile --src-prefix=piper/capnp -osv-dependency-builds/win64-msvc/bin/capnpc-c++:piper-vamp-cpp/vamp-capnp piper/capnp/piper.capnp
33
if %errorlevel% neq 0 exit /b %errorlevel%
34

  
35
mkdir build_win64_debug
36
cd build_win64_debug
37

  
38
qmake -spec win32-msvc -r -tp vc ..\vect.pro
39
if %errorlevel% neq 0 exit /b %errorlevel%
40

  
41
msbuild vect.sln /t:Build /p:Configuration=Debug
42
if %errorlevel% neq 0 exit /b %errorlevel%
43

  
44
copy .\checker\debug\vamp-plugin-load-checker.exe .\debug
45

  
46
copy %QTDIR%\bin\Qt5Cored.dll .\debug
47
copy %QTDIR%\bin\Qt5Guid.dll .\debug
48
copy %QTDIR%\bin\Qt5Widgetsd.dll .\debug
49
copy %QTDIR%\bin\Qt5Networkd.dll .\debug
50
copy %QTDIR%\bin\Qt5Xmld.dll .\debug
51
copy %QTDIR%\bin\Qt5Svgd.dll .\debug
52
copy %QTDIR%\bin\Qt5Testd.dll .\debug
53
copy %QTDIR%\plugins\platforms\qminimald.dll .\debug
54
copy %QTDIR%\plugins\platforms\qwindowsd.dll .\debug
55
copy %QTDIR%\plugins\styles\qwindowsvistastyled.dll .\debug
56
copy ..\sv-dependency-builds\win64-msvc\lib\libsndfile-1.dll .\debug
57

  
58
rem some of these expect to be run from the project root
59
cd ..
60
build_win64_debug\debug\test-svcore-base
61
if %errorlevel% neq 0 exit /b %errorlevel%
62
build_win64_debug\debug\test-svcore-system
63
if %errorlevel% neq 0 exit /b %errorlevel%
64
build_win64_debug\debug\test-svcore-data-fileio
65
if %errorlevel% neq 0 exit /b %errorlevel%
66
build_win64_debug\debug\test-svcore-data-model
67
if %errorlevel% neq 0 exit /b %errorlevel%
68

  
69
set PATH=%ORIGINALPATH%
deploy/win64/build-64.bat
1
rem  Run this from within the top-level SV dir: deploy\win64\build-64.bat
2
rem  To build from clean, delete the folder build_win64 first
3

  
4
echo on
5

  
6
set STARTPWD=%CD%
7

  
8
set QTDIR=C:\Qt\5.12.2\msvc2017_64
9
if not exist %QTDIR% (
10
@   echo Could not find 64-bit Qt
11
@   exit /b 2
12
)
13

  
14
if not exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" (
15
@   echo "Could not find MSVC vars batch file"
16
@   exit /b 2
17
)
18

  
19
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
20

  
21
set ORIGINALPATH=%PATH%
22
set PATH=%PATH%;C:\Program Files (x86)\SMLNJ\bin;%QTDIR%\bin
23

  
24
cd %STARTPWD%
25

  
26
call .\repoint install
27
if %errorlevel% neq 0 exit /b %errorlevel%
28

  
29
sv-dependency-builds\win64-msvc\bin\capnp -Isv-dependency-builds/win64-msvc/include compile --src-prefix=piper/capnp -osv-dependency-builds/win64-msvc/bin/capnpc-c++:piper-vamp-cpp/vamp-capnp piper/capnp/piper.capnp
30
if %errorlevel% neq 0 exit /b %errorlevel%
31

  
32
mkdir build_win64
33
cd build_win64
34

  
35
qmake -spec win32-msvc -r -tp vc ..\vect.pro
36
if %errorlevel% neq 0 exit /b %errorlevel%
37

  
38
msbuild vect.sln /t:Build /p:Configuration=Release
39
if %errorlevel% neq 0 exit /b %errorlevel%
40

  
41
copy .\checker\release\vamp-plugin-load-checker.exe .\release
42

  
43
copy %QTDIR%\bin\Qt5Core.dll .\release
44
copy %QTDIR%\bin\Qt5Gui.dll .\release
45
copy %QTDIR%\bin\Qt5Widgets.dll .\release
46
copy %QTDIR%\bin\Qt5Network.dll .\release
47
copy %QTDIR%\bin\Qt5Xml.dll .\release
48
copy %QTDIR%\bin\Qt5Svg.dll .\release
49
copy %QTDIR%\bin\Qt5Test.dll .\release
50
copy %QTDIR%\plugins\platforms\qminimal.dll .\release
51
copy %QTDIR%\plugins\platforms\qwindows.dll .\release
52
copy %QTDIR%\plugins\styles\qwindowsvistastyle.dll .\release
53
copy ..\sv-dependency-builds\win64-msvc\lib\libsndfile-1.dll .\release
54

  
55
rem some of these expect to be run from the project root
56
cd ..
57
build_win64\release\test-svcore-base
58
if %errorlevel% neq 0 exit /b %errorlevel%
59
build_win64\release\test-svcore-system
60
if %errorlevel% neq 0 exit /b %errorlevel%
61
build_win64\release\test-svcore-data-fileio
62
if %errorlevel% neq 0 exit /b %errorlevel%
63
build_win64\release\test-svcore-data-model
64
if %errorlevel% neq 0 exit /b %errorlevel%
65

  
66
set PATH=%ORIGINALPATH%
deploy/win64/build-and-package.bat
1
rem  Run this from within the top-level SV dir: deploy\win64\build-and-package.bat
2

  
3
set STARTPWD=%CD%
4

  
5
if not exist "C:\Program Files (x86)\SMLNJ\bin" (
6
@   echo Could not find SML/NJ, required for Repoint
7
@   exit /b 2
8
)
9

  
10
if not exist "C:\Program Files (x86)\WiX Toolset v3.11\bin" (
11
@   echo Could not find WiX Toolset
12
@   exit /b 2
13
)
14

  
15
set ORIGINALPATH=%PATH%
16
set PATH=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin;%PATH%
17
set NAME=Open Source Developer, Christopher Cannam
18

  
19
set ARG=%1
20
shift
21
if "%ARG%" == "sign" (
22
@   echo NOTE: sign option specified, will attempt to codesign exe and msi
23
@   echo NOTE: starting by codesigning an unrelated executable, so we know
24
@   echo NOTE: whether it'll work before doing the entire build
25
copy sv-dependency-builds\win64-msvc\bin\capnp.exe signtest.exe
26
signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 signtest.exe
27
if errorlevel 1 exit /b %errorlevel%
28
signtool verify /pa signtest.exe
29
if errorlevel 1 exit /b %errorlevel%
30
del signtest.exe
31
@   echo NOTE: success
32
) else (
33
@   echo NOTE: sign option not specified, will not codesign anything
34
)
35

  
36
@echo ""
37
@echo Rebuilding 64-bit
38

  
39
cd %STARTPWD%
40
del /q /s build_win64
41
call .\deploy\win64\build-64.bat
42
if %errorlevel% neq 0 exit /b %errorlevel%
43

  
44
if "%ARG%" == "sign" (
45
@echo Signing 64-bit executables and libraries
46
signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 build_win64\release\*.exe build_win64\release\*.dll
47
)
48

  
49
set PATH=%PATH%;"C:\Program Files (x86)\WiX Toolset v3.11\bin"
50

  
51
@echo Packaging 64-bit
52

  
53
cd %STARTPWD%\build_win64
54
del sonic-vector.msi
55
candle -v ..\deploy\win64\sonic-vector.wxs
56
light -b . -ext WixUIExtension -ext WixUtilExtension -v sonic-vector.wixobj
57
if %errorlevel% neq 0 exit /b %errorlevel%
58
del sonic-vector.wixobj
59
del sonic-vector.wixpdb
60

  
61
if "%ARG%" == "sign" (
62
@echo Signing 64-bit package
63
signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 sonic-vector.msi
64
signtool verify /pa sonic-vector.msi
65
)
66

  
67
set PATH=%ORIGINALPATH%
68

  
69
@echo Done
70

  
deploy/win64/sonic-vector.wxs
1
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
2

  
3
<!-- TODO: rewrite GUIDs, these are still those from (other) SV -->
4

  
5
  <Product
6
      Name="Sonic Vector" 
7
      Id="*"
8
      Language="1033"
9
      Codepage="1252" 
10
      Version="3.2"
11
      UpgradeCode="D476941E-65F3-4962-9E72-B40FAAE5DBD0"
12
      Manufacturer="Queen Mary, University of London">
13
    
14
    <Package
15
        Id="*"
16
        Keywords="Installer"
17
        Description="Sonic Vector 64-bit Installer" 
18
        Comments="Copyright (c) 2018 Queen Mary, University of London and others."
19
        Manufacturer="Queen Mary, University of London" 
20
        InstallerVersion="200"
21
        Languages="1033" 
22
        Compressed="yes" 
23
        Platform="x64"
24
        SummaryCodepage="1252"/>
25

  
26
    <MajorUpgrade DowngradeErrorMessage="A later version of Sonic Vector is already installed. Setup will now exit."/>
27

  
28
    <Media Id="1" Cabinet="SonicVector.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1"/>
29
    <Property Id="DiskPrompt" Value="Sonic Vector Installation [1]"/>
30

  
31
    <Directory Id="TARGETDIR" Name="SourceDir">
32

  
33
      <Directory Id="ProgramFiles64Folder" Name="PFiles64">
34
        <Directory Id="VampPlugins" Name="Vamp Plugins">
35
          <Component Win64="yes"
36
              Id="VampPlugins"
37
              Guid="528C7D7E-5A06-4E7D-89BB-7C16431DF82F">
38
            <File
39
                Id="VampREADME"
40
                Name="README.txt"
41
                Source="..\deploy\win64\README-Vamp.txt"/>
42
          </Component>
43
        </Directory>
44

  
45
        <Directory Id="APPLICATIONFOLDER" Name="Sonic Vector">
46

  
47
          <Component Win64="yes"
48
              Id="MainExecutable"
49
              Guid="65E1EBDF-4C8F-47B8-BCD6-981667F5946D">
50

  
51
            <File
52
                Id="SVExecutable"
53
                Name="Sonic Vector.exe"
54
                Source="release\Sonic Vector.exe"
55
                KeyPath="yes">
56

  
57
              <Shortcut
58
                  Id="SVStartEntry"
59
                  Directory="ProgramMenuDir"
60
                  Name="Sonic Vector"
61
                  WorkingDirectory="APPLICATIONFOLDER"
62
                  Icon="winicon.ico"
63
                  IconIndex="0"
64
                  Advertise="yes"/>
65

  
66
              <Shortcut
67
                  Id="SVDesktop"
68
                  Directory="DesktopFolder"
69
                  Name="Sonic Vector"
70
                  WorkingDirectory="APPLICATIONFOLDER"
71
                  Icon="winicon.ico"
72
                  IconIndex="0"
73
                  Advertise="yes"/>
74
            </File>
75

  
76
            <File
77
                Id="COPYING"
78
                Name="COPYING.txt"
79
                Source="..\COPYING"/>
80
            <File
81
                Id="README"
82
                Name="README.txt"
83
                Source="..\README.md"/>
84
            <File
85
                Id="CHANGELOG"
86
                Name="CHANGELOG.txt"
87
                Source="..\CHANGELOG"/>
88
            <File
89
                Id="CITATION"
90
                Name="CITATION.txt"
91
                Source="..\CITATION"/>
92

  
93
            <File
94
                Id="winicon.ico"
95
                Name="sv-winicon.ico"
96
                Source="..\icons\sv-winicon.ico"/>
97
          </Component>
98
          
99
          <Component Win64="yes"
100
	      Id="SVFileAssociation"
101
	      Guid="F07C5CC1-0209-4C1A-8D52-C40B50A2B964">
102
            
103
            <CreateFolder/>
104

  
105
            <ProgId 
106
                Id='SonicVector.svfile' 
107
                Description='Sonic Vector project file'
108
                Icon="SVExecutable">
109
              <Extension 
110
                  Id='sv' 
111
                  ContentType='application/sonicvector'>
112
                <Verb 
113
                    Id='open' 
114
                    Command='Open' 
115
                    TargetFile='SVExecutable' 
116
                    Argument='"%1"' />
117
              </Extension>
118
            </ProgId>
119
            
120
          </Component>
121
          
122
          <Component Win64="yes"
123
              Id="Qt5"
124
              Guid="5495ED5E-939A-4BE8-9000-D55F2A7A2E90">
125
            <File
126
                Id="QtCore"
127
                Name="Qt5Core.dll"
128
                Source="release\Qt5Core.dll"
129
		KeyPath="yes"/>
130
            <File
131
                Id="QtGui"
132
                Name="Qt5Gui.dll"
133
                Source="release\Qt5Gui.dll"/>
134
            <File
135
                Id="QtNetwork"
136
                Name="Qt5Network.dll"
137
                Source="release\Qt5Network.dll"/>
138
            <File
139
                Id="QtWidgets"
140
                Name="Qt5Widgets.dll"
141
                Source="release\Qt5Widgets.dll"/>
142
            <File
143
                Id="QtXml"
144
                Name="Qt5Xml.dll"
145
                Source="release\Qt5Xml.dll"/>
146
            <File
147
                Id="QtSvg"
148
                Name="Qt5Svg.dll"
149
                Source="release\Qt5Svg.dll"/>
150
          </Component>
151

  
152
          <Component Win64="yes"
153
                     Id="Sndfile"
154
                     Guid="04533516-6460-4155-A0D4-E9BA4D31E95C">
155
            <File
156
                Id="libsndfile"
157
                Name="libsndfile-1.dll"
158
                Source="..\sv-dependency-builds\win64-msvc\lib\libsndfile-1.dll"
159
                KeyPath="yes"/>
160
          </Component>
161

  
162
          <Component Win64="yes"
163
               Id="VCRuntime"
164
               Guid="251D9513-BBD2-47CF-BE78-EF79446F7683">
165

  
166
            <!-- Redistributables are handled by the Visual Studio
167
                 installer (a separate program from VS itself) and are
168
                 installed into C:\Program Files (x86)\Microsoft
169
                 Visual Studio\2017\Community\VC\Redist\MSVC\...  NB
170
                 this is not the same thing as the Windows SDKs, which
171
                 consist of build tools etc - they have their own
172
                 installers and get installed by default to C:\Program
173
                 Files (x86)\Windows Kits\... -->
174
               
175
               <File
176
                   Id="concrt140"
177
                   Name="concrt140.dll"
178
                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\concrt140.DLL"
179
                   KeyPath="yes"/>
180
               <File
181
                   Id="msvcp140"
182
                   Name="msvcp140.dll"
183
                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\msvcp140.DLL"/>
184
               <File
185
                   Id="vccorlib140"
186
                   Name="vccorlib140.dll"
187
                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\vccorlib140.DLL"/>
188
               <File
189
                   Id="vcruntime140"
190
                   Name="vcruntime140.dll"
191
                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\vcruntime140.DLL"/>
192
          </Component>
193

  
194
	  <Directory Id="Platforms" Name="platforms">
195
            <Component Win64="yes"
196
                Id="Qt5PlatformPlugins"
197
                Guid="1FFB773E-6D6D-4C0E-832B-F0FFEA959CA5">
198
	      <File
199
                  Id="qminimal"
200
                  Name="qminimal.dll"
201
                  Source="release\qminimal.dll"/>
202
	      <File
203
                  Id="qwindows"
204
                  Name="qwindows.dll"
205
                  Source="release\qwindows.dll"/>
206
            </Component>
207
	  </Directory>
208

  
209
	  <Directory Id="Styles" Name="styles">
210
            <Component Win64="yes"
211
                Id="Qt5StylePlugins"
212
                Guid="7A676FC1-B139-432C-A7D3-F33984934B79">
213
	      <File
214
                  Id="qwindowsvistastyle"
215
                  Name="qwindowsvistastyle.dll"
216
                  Source="release\qwindowsvistastyle.dll"/>
217
            </Component>
218
	  </Directory>
219

  
220
	  <Directory Id="Helpers" Name="helpers">
221
            <Component Win64="yes"
222
                Id="Piper64"
223
                Guid="6385BD86-A5D3-4C77-AD41-B2DCA5B34E48">
224
	      <File
225
		  Id="piperconv64"
226
		  Name="piper-convert.exe"
227
		  Source="release\piper-convert.exe"/>
228
	      <File
229
		  Id="piper64"
230
		  Name="piper-vamp-simple-server.exe"
231
		  Source="release\piper-vamp-simple-server.exe"/>
232
              <File
233
                  Id="concrt140h"
234
                  Name="concrt140.dll"
235
                  Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\concrt140.DLL"
236
                  KeyPath="yes"/>
237
              <File
238
                  Id="msvcp140h"
239
                  Name="msvcp140.dll"
240
                  Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\msvcp140.DLL"/>
241
              <File
242
                  Id="vccorlib140h"
243
                  Name="vccorlib140.dll"
244
                  Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\vccorlib140.DLL"/>
245
              <File
246
                  Id="vcruntime140h"
247
                  Name="vcruntime140.dll"
248
                  Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\vcruntime140.DLL"/>
249
	    </Component>
250
            <Component Win64="yes"
251
                Id="Checker64"
252
                Guid="19A400D9-D5B2-4CB5-AF84-7C1DEA11D7B5">
253
	      <File
254
		  Id="checker64"
255
		  Name="vamp-plugin-load-checker.exe"
256
		  Source="release\vamp-plugin-load-checker.exe"/>
257
	    </Component>
258
	    
259
	  </Directory> <!-- helpers -->
260
	</Directory> <!-- sv -->
261
      </Directory> <!-- pfiles64 -->
262

  
263
      <Directory Id="ProgramMenuFolder" Name="Programs">
264
        <Directory Id="ProgramMenuDir" Name="Sonic Vector">
265
          <Component Id="ProgramMenuDir" Guid="C1980FF3-D135-46F8-8542-F937748721E6">
266
            <RemoveFolder Id="ProgramMenuDir" On="uninstall"/>
267
            <RegistryValue Root="HKMU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" KeyPath="yes"/>
268
          </Component>
269
        </Directory>
270
      </Directory>
271

  
272
      <Directory Id="DesktopFolder" Name="Desktop"/>
273

  
274
    </Directory>
275

  
276
    <Feature 
277
	Id="Complete"
278
	Title="Required files"
279
	Description="Installs the required files for running Sonic Vector."
280
	AllowAdvertise="no"
281
	Absent="disallow"
282
	ConfigurableDirectory="APPLICATIONFOLDER"
283
	Level="1">
284
      <ComponentRef Id="VampPlugins"/>
285
      <ComponentRef Id="MainExecutable"/>
286
      <ComponentRef Id="SVFileAssociation"/>
287
      <ComponentRef Id="Sndfile"/>
288
      <ComponentRef Id="Qt5"/>
289
      <ComponentRef Id="VCRuntime"/>
290
      <ComponentRef Id="Qt5PlatformPlugins"/>
291
      <ComponentRef Id="Qt5StylePlugins"/>
292
      <ComponentRef Id="Piper64"/>
293
      <ComponentRef Id="Checker64"/>
294
      <ComponentRef Id="ProgramMenuDir"/>
295
    </Feature>
296

  
297
    <UI>
298
      <UIRef Id="WixUI_InstallDir" />
299
      <UIRef Id="WixUI_ErrorProgressText" />
300
    </UI>
301

  
302
    <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />
303
    <Property Id="WIXUI_DONTVALIDATEPATH" Value="1" />
304
    <Property Id="ApplicationFolderName" Value="Sonic Vector" />
305
    <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
306
    <WixVariable Id="WixUILicenseRtf" Value="..\deploy\win64\License.rtf" />
307
    
308
    <Icon Id="winicon.ico" SourceFile="..\icons\sv-winicon.ico"/>
309
    <Property Id="ARPPRODUCTICON" Value="winicon.ico" />
310

  
311
    <WixVariable Id="WixUIBannerBmp" Value="..\deploy\win64\top.bmp"/>
312
    <WixVariable Id="WixUIDialogBmp" Value="..\deploy\win64\main.bmp"/>
313

  
314
  </Product> </Wix>
main/main.cpp
90 90
    signal(SIGINT,  signalHandler);
91 91
    signal(SIGTERM, signalHandler);
92 92

  
93
#ifndef Q_WS_WIN32
93
#ifndef Q_OS_WIN32
94 94
    signal(SIGHUP,  signalHandler);
95 95
    signal(SIGQUIT, signalHandler);
96 96
#endif
test-svcore-base.pro
28 28
for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) }
29 29
for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) }
30 30

  
31
QMAKE_POST_LINK = ./$${TARGET}$${TARGET_EXT}
31
!win32* {
32
    QMAKE_POST_LINK = ./$${TARGET}
33
}
test-svcore-data-fileio.pro
28 28
for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) }
29 29
for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) }
30 30

  
31
QMAKE_POST_LINK = ./$${TARGET}$${TARGET_EXT}
31
!win32* {
32
    QMAKE_POST_LINK = ./$${TARGET}
33
}
test-svcore-data-model.pro
28 28
for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) }
29 29
for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) }
30 30

  
31
QMAKE_POST_LINK = ./$${TARGET}$${TARGET_EXT}
31
!win32* {
32
    QMAKE_POST_LINK = ./$${TARGET}
33
}
34

  

Also available in: Unified diff