Skip to content

Commit 57a0580

Browse files
jacobwilliamsjacobwilliams
committed
updates to Visual Studio jsonfortrantest project. Updated directories. Added 64 bit builds.
Changed extensions of all tests to F90 since they are now all preprocessed.
1 parent f4bc7ea commit 57a0580

File tree

3 files changed

+91
-68
lines changed

3 files changed

+91
-68
lines changed

‎.gitignore

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ doc/
1111
.sconsign.*
1212
files/*.json
1313
.cflags.*
14-
visual_studio/*.suo
15-
visual_studio/*.u2d
14+
*.suo
15+
*.u2d
16+
*.user
17+
1618
visual_studio/Debug/
1719
visual_studio/Release/
1820
visual_studio/x64/
1921
visual_studio/.vs/
2022
visual_studio/jsonfortranlib/
21-
2223
visual_studio/jsonfortrantest/Debug/
23-
*.u2d
24-
*.user
24+
visual_studio/jsonfortrantest/Release/
25+
visual_studio/jsonfortrantest/x64

‎visual_studio/jsonfortran.sln

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.40629.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "jsonfortranlib", "jsonfortranlib\jsonfortranlib.vfproj", "{9A2FEBBE-6702-448E-B361-AE3EA614F5CF}"
77
EndProject
@@ -28,10 +28,12 @@ Global
2828
{9A2FEBBE-6702-448E-B361-AE3EA614F5CF}.Release|x64.Build.0 = Release|x64
2929
{6B8385E8-4E5B-4C63-8A06-F2DABE97F304}.Debug|Win32.ActiveCfg = Debug|Win32
3030
{6B8385E8-4E5B-4C63-8A06-F2DABE97F304}.Debug|Win32.Build.0 = Debug|Win32
31-
{6B8385E8-4E5B-4C63-8A06-F2DABE97F304}.Debug|x64.ActiveCfg = Debug|Win32
31+
{6B8385E8-4E5B-4C63-8A06-F2DABE97F304}.Debug|x64.ActiveCfg = Debug|x64
32+
{6B8385E8-4E5B-4C63-8A06-F2DABE97F304}.Debug|x64.Build.0 = Debug|x64
3233
{6B8385E8-4E5B-4C63-8A06-F2DABE97F304}.Release|Win32.ActiveCfg = Release|Win32
3334
{6B8385E8-4E5B-4C63-8A06-F2DABE97F304}.Release|Win32.Build.0 = Release|Win32
34-
{6B8385E8-4E5B-4C63-8A06-F2DABE97F304}.Release|x64.ActiveCfg = Release|Win32
35+
{6B8385E8-4E5B-4C63-8A06-F2DABE97F304}.Release|x64.ActiveCfg = Release|x64
36+
{6B8385E8-4E5B-4C63-8A06-F2DABE97F304}.Release|x64.Build.0 = Release|x64
3537
EndGlobalSection
3638
GlobalSection(SolutionProperties) = preSolution
3739
HideSolutionNode = FALSE

‎visual_studio/jsonfortrantest/jsonfortrantest.vfproj

Lines changed: 79 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,79 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{6B8385E8-4E5B-4C63-8A06-F2DABE97F304}">
3-
<Platforms>
4-
<Platform Name="Win32"/></Platforms>
5-
<Configurations>
6-
<Configuration Name="Debug|Win32">
7-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" PreprocessorDefinitions="INTERGATED_TESTS" WarnInterfaces="true" Traceback="true" BoundsCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
8-
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" SubSystem="subSystemConsole"/>
9-
<Tool Name="VFResourceCompilerTool"/>
10-
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
11-
<Tool Name="VFCustomBuildTool"/>
12-
<Tool Name="VFPreLinkEventTool"/>
13-
<Tool Name="VFPreBuildEventTool"/>
14-
<Tool Name="VFPostBuildEventTool"/>
15-
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
16-
<Configuration Name="Release|Win32">
17-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Preprocess="preprocessYes" PreprocessorDefinitions="INTERGATED_TESTS" RuntimeLibrary="rtMultiThreadedDLL"/>
18-
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" SubSystem="subSystemConsole"/>
19-
<Tool Name="VFResourceCompilerTool"/>
20-
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
21-
<Tool Name="VFCustomBuildTool"/>
22-
<Tool Name="VFPreLinkEventTool"/>
23-
<Tool Name="VFPreBuildEventTool"/>
24-
<Tool Name="VFPostBuildEventTool"/>
25-
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
26-
<Files>
27-
<Filter Name="src" Filter="f90;for;f;fpp;ftn;def;odl;idl">
28-
<File RelativePath="..\..\src\tests\jf_test_1.f90"/>
29-
<File RelativePath="..\..\src\tests\jf_test_10.f90"/>
30-
<File RelativePath="..\..\src\tests\jf_test_11.F90"/>
31-
<File RelativePath="..\..\src\tests\jf_test_12.f90"/>
32-
<File RelativePath="..\..\src\tests\jf_test_13.f90"/>
33-
<File RelativePath="..\..\src\tests\jf_test_14.f90"/>
34-
<File RelativePath="..\..\src\tests\jf_test_15.f90"/>
35-
<File RelativePath="..\..\src\tests\jf_test_16.f90"/>
36-
<File RelativePath="..\..\src\tests\jf_test_17.f90"/>
37-
<File RelativePath="..\..\src\tests\jf_test_18.f90"/>
38-
<File RelativePath="..\..\src\tests\jf_test_19.f90"/>
39-
<File RelativePath="..\..\src\tests\jf_test_2.f90"/>
40-
<File RelativePath="..\..\src\tests\jf_test_20.f90"/>
41-
<File RelativePath="..\..\src\tests\jf_test_21.f90"/>
42-
<File RelativePath="..\..\src\tests\jf_test_22.f90"/>
43-
<File RelativePath="..\..\src\tests\jf_test_23.f90"/>
44-
<File RelativePath="..\..\src\tests\jf_test_24.F90"/>
45-
<File RelativePath="..\..\src\tests\jf_test_25.F90"/>
46-
<File RelativePath="..\..\src\tests\jf_test_26.f90"/>
47-
<File RelativePath="..\..\src\tests\jf_test_27.f90"/>
48-
<File RelativePath="..\..\src\tests\jf_test_29.f90"/>
49-
<File RelativePath="..\..\src\tests\jf_test_30.f90"/>
50-
<File RelativePath="..\..\src\tests\jf_test_3.f90"/>
51-
<File RelativePath="..\..\src\tests\jf_test_4.f90"/>
52-
<File RelativePath="..\..\src\tests\jf_test_5.f90"/>
53-
<File RelativePath="..\..\src\tests\jf_test_6.f90"/>
54-
<File RelativePath="..\..\src\tests\jf_test_7.f90"/>
55-
<File RelativePath="..\..\src\tests\jf_test_8.f90"/>
56-
<File RelativePath="..\..\src\tests\jf_test_9.f90"/>
57-
<File RelativePath=".\jsonfortrantest.f90"/></Filter>
58-
<File RelativePath=".\ReadMe.txt"/></Files>
59-
<Globals/></VisualStudioProject>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{6B8385E8-4E5B-4C63-8A06-F2DABE97F304}">
3+
<Platforms>
4+
<Platform Name="Win32"/>
5+
<Platform Name="x64"/></Platforms>
6+
<Configurations>
7+
<Configuration Name="Debug|Win32" OutputDirectory="../../bin" TargetName="$(ProjectName)d">
8+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" AdditionalIncludeDirectories="../jsonfortranlib/win32/Debug" PreprocessorDefinitions="INTERGATED_TESTS" WarnInterfaces="true" Traceback="true" BoundsCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
9+
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../lib/win32" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="libjsonfortrand.lib"/>
10+
<Tool Name="VFResourceCompilerTool"/>
11+
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
12+
<Tool Name="VFCustomBuildTool"/>
13+
<Tool Name="VFPreLinkEventTool"/>
14+
<Tool Name="VFPreBuildEventTool"/>
15+
<Tool Name="VFPostBuildEventTool"/>
16+
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
17+
<Configuration Name="Release|Win32" OutputDirectory="../../bin">
18+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Preprocess="preprocessYes" AdditionalIncludeDirectories="../jsonfortranlib/win32/Release" PreprocessorDefinitions="INTERGATED_TESTS" RuntimeLibrary="rtMultiThreadedDLL"/>
19+
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../lib/win32" SubSystem="subSystemConsole" AdditionalDependencies="libjsonfortran.lib"/>
20+
<Tool Name="VFResourceCompilerTool"/>
21+
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
22+
<Tool Name="VFCustomBuildTool"/>
23+
<Tool Name="VFPreLinkEventTool"/>
24+
<Tool Name="VFPreBuildEventTool"/>
25+
<Tool Name="VFPostBuildEventTool"/>
26+
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
27+
<Configuration Name="Debug|x64" OutputDirectory="../../bin" TargetName="$(ProjectName)d">
28+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" AdditionalIncludeDirectories="../jsonfortranlib/x64/Debug" PreprocessorDefinitions="INTERGATED_TESTS" WarnInterfaces="true" Traceback="true" BoundsCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
29+
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../lib/x64" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="libjsonfortrand.lib"/>
30+
<Tool Name="VFResourceCompilerTool"/>
31+
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
32+
<Tool Name="VFCustomBuildTool"/>
33+
<Tool Name="VFPreLinkEventTool"/>
34+
<Tool Name="VFPreBuildEventTool"/>
35+
<Tool Name="VFPostBuildEventTool"/>
36+
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
37+
<Configuration Name="Release|x64" OutputDirectory="../../bin">
38+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Preprocess="preprocessYes" AdditionalIncludeDirectories="../jsonfortranlib/x64/Release" PreprocessorDefinitions="INTERGATED_TESTS" RuntimeLibrary="rtMultiThreadedDLL"/>
39+
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../lib/x64" SubSystem="subSystemConsole" AdditionalDependencies="libjsonfortran.lib"/>
40+
<Tool Name="VFResourceCompilerTool"/>
41+
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
42+
<Tool Name="VFCustomBuildTool"/>
43+
<Tool Name="VFPreLinkEventTool"/>
44+
<Tool Name="VFPreBuildEventTool"/>
45+
<Tool Name="VFPostBuildEventTool"/>
46+
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
47+
<Files>
48+
<Filter Name="src" Filter="f90;for;f;fpp;ftn;def;odl;idl">
49+
<File RelativePath="..\..\src\tests\jf_test_1.F90"/>
50+
<File RelativePath="..\..\src\tests\jf_test_10.F90"/>
51+
<File RelativePath="..\..\src\tests\jf_test_11.F90"/>
52+
<File RelativePath="..\..\src\tests\jf_test_12.F90"/>
53+
<File RelativePath="..\..\src\tests\jf_test_13.F90"/>
54+
<File RelativePath="..\..\src\tests\jf_test_14.F90"/>
55+
<File RelativePath="..\..\src\tests\jf_test_15.F90"/>
56+
<File RelativePath="..\..\src\tests\jf_test_16.F90"/>
57+
<File RelativePath="..\..\src\tests\jf_test_17.F90"/>
58+
<File RelativePath="..\..\src\tests\jf_test_18.F90"/>
59+
<File RelativePath="..\..\src\tests\jf_test_19.F90"/>
60+
<File RelativePath="..\..\src\tests\jf_test_2.F90"/>
61+
<File RelativePath="..\..\src\tests\jf_test_20.F90"/>
62+
<File RelativePath="..\..\src\tests\jf_test_21.F90"/>
63+
<File RelativePath="..\..\src\tests\jf_test_22.F90"/>
64+
<File RelativePath="..\..\src\tests\jf_test_23.F90"/>
65+
<File RelativePath="..\..\src\tests\jf_test_24.F90"/>
66+
<File RelativePath="..\..\src\tests\jf_test_25.F90"/>
67+
<File RelativePath="..\..\src\tests\jf_test_26.F90"/>
68+
<File RelativePath="..\..\src\tests\jf_test_27.F90"/>
69+
<File RelativePath="..\..\src\tests\jf_test_29.F90"/>
70+
<File RelativePath="..\..\src\tests\jf_test_3.F90"/>
71+
<File RelativePath="..\..\src\tests\jf_test_30.F90"/>
72+
<File RelativePath="..\..\src\tests\jf_test_4.F90"/>
73+
<File RelativePath="..\..\src\tests\jf_test_5.F90"/>
74+
<File RelativePath="..\..\src\tests\jf_test_6.F90"/>
75+
<File RelativePath="..\..\src\tests\jf_test_7.F90"/>
76+
<File RelativePath="..\..\src\tests\jf_test_8.F90"/>
77+
<File RelativePath="..\..\src\tests\jf_test_9.F90"/>
78+
<File RelativePath=".\jsonfortrantest.f90"/></Filter></Files>
79+
<Globals/></VisualStudioProject>

0 commit comments

Comments
 (0)