Skip to content
This repository was archived by the owner on Sep 15, 2022. It is now read-only.

Commit dde05ef

Browse files
committed
Add a couple of files missed in the last commit, and update the VC++
version in the INSTALL file.
1 parent 95b8bac commit dde05ef

File tree

4 files changed

+229
-2
lines changed

4 files changed

+229
-2
lines changed

INSTALL

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ Windows
138138
You will need:
139139

140140
- Windows 2000 or above.
141-
- Microsoft Visual C++ 2008.
142-
- The Windows 2008 Platform SDK.
141+
- Microsoft Visual C++ 2010.
142+
- The Windows 2010 Platform SDK.
143143
- Windows Installer XML v3.
144144
- wxMSW 2.8.11 or above from http://www.wxwidgets.org/
145145
- libxml2 2.6.18 or above from http://www.xmlsoft.org/

pgAdmin3.props

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup
4+
Condition="'$(png2cBeforeTargets)' == '' and '$(png2cAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">
5+
<png2cBeforeTargets>Midl</png2cBeforeTargets>
6+
<png2cAfterTargets>CustomBuild</png2cAfterTargets>
7+
</PropertyGroup>
8+
<PropertyGroup>
9+
<png2cDependsOn
10+
Condition="'$(ConfigurationType)' != 'Makefile'">_SelectedFiles;$(png2cDependsOn)</png2cDependsOn>
11+
</PropertyGroup>
12+
<ItemDefinitionGroup>
13+
<png2c>
14+
<CommandLineTemplate> "$(SolutionDir)xtra\png2c\$(Configuration)\png2c.exe" [AllOptions] [AdditionalOptions] "%(FullPath)" "%(FullPath)c" </CommandLineTemplate>
15+
<Outputs>%(FullPath)c</Outputs>
16+
<ExecutionDescription>Compiling PNG (%(FullPath))...</ExecutionDescription>
17+
</png2c>
18+
</ItemDefinitionGroup>
19+
</Project>

pgAdmin3.targets

+81
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<PropertyPageSchema
5+
Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />
6+
<AvailableItemName
7+
Include="png2c">
8+
<Targets>_png2c</Targets>
9+
</AvailableItemName>
10+
</ItemGroup>
11+
<UsingTask
12+
TaskName="png2c"
13+
TaskFactory="XamlTaskFactory"
14+
AssemblyName="Microsoft.Build.Tasks.v4.0">
15+
<Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>
16+
</UsingTask>
17+
<Target
18+
Name="_png2c"
19+
BeforeTargets="$(png2cBeforeTargets)"
20+
AfterTargets="$(png2cAfterTargets)"
21+
Condition="'@(png2c)' != ''"
22+
DependsOnTargets="$(png2cDependsOn);Computepng2cOutput"
23+
Outputs="%(png2c.Outputs)"
24+
Inputs="%(png2c.Identity);%(png2c.AdditionalDependencies);$(MSBuildProjectFile)">
25+
<ItemGroup
26+
Condition="'@(SelectedFiles)' != ''">
27+
<png2c
28+
Remove="@(png2c)"
29+
Condition="'%(Identity)' != '@(SelectedFiles)'" />
30+
</ItemGroup>
31+
<ItemGroup>
32+
<png2c_tlog
33+
Include="%(png2c.Outputs)"
34+
Condition="'%(png2c.Outputs)' != '' and '%(png2c.ExcludedFromBuild)' != 'true'">
35+
<Source>@(png2c, '|')</Source>
36+
</png2c_tlog>
37+
</ItemGroup>
38+
<Message
39+
Importance="High"
40+
Text="%(png2c.ExecutionDescription)" />
41+
<WriteLinesToFile
42+
Condition="'@(png2c_tlog)' != '' and '%(png2c_tlog.ExcludedFromBuild)' != 'true'"
43+
File="$(IntDir)$(ProjectName).write.1.tlog"
44+
Lines="^%(png2c_tlog.Source);@(png2c_tlog-&gt;'%(Fullpath)')" />
45+
<png2c
46+
Condition="'@(png2c)' != '' and '%(png2c.ExcludedFromBuild)' != 'true'"
47+
CommandLineTemplate="%(png2c.CommandLineTemplate)"
48+
AdditionalOptions="%(png2c.AdditionalOptions)"
49+
Inputs="%(png2c.Identity)" />
50+
</Target>
51+
<PropertyGroup>
52+
<ComputeLinkInputsTargets>
53+
$(ComputeLinkInputsTargets);
54+
Computepng2cOutput;
55+
</ComputeLinkInputsTargets>
56+
<ComputeLibInputsTargets>
57+
$(ComputeLibInputsTargets);
58+
Computepng2cOutput;
59+
</ComputeLibInputsTargets>
60+
</PropertyGroup>
61+
<Target
62+
Name="Computepng2cOutput"
63+
Condition="'@(png2c)' != ''">
64+
<ItemGroup>
65+
<png2cDirsToMake
66+
Condition="'@(png2c)' != '' and '%(png2c.ExcludedFromBuild)' != 'true'"
67+
Include="%(png2c.Outputs)" />
68+
<Link
69+
Include="%(png2cDirsToMake.Identity)"
70+
Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
71+
<Lib
72+
Include="%(png2cDirsToMake.Identity)"
73+
Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
74+
<ImpLib
75+
Include="%(png2cDirsToMake.Identity)"
76+
Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
77+
</ItemGroup>
78+
<MakeDir
79+
Directories="@(png2cDirsToMake-&gt;'%(RootDir)%(Directory)')" />
80+
</Target>
81+
</Project>

pgAdmin3.xml

+127
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:transformCallback="Microsoft.Cpp.Dev10.ConvertPropertyCallback">
3+
<Rule
4+
Name="png2c"
5+
PageTemplate="tool"
6+
DisplayName="PNG Compiler"
7+
Order="200">
8+
<Rule.DataSource>
9+
<DataSource
10+
Persistence="ProjectFile"
11+
ItemType="png2c" />
12+
</Rule.DataSource>
13+
<Rule.Categories>
14+
<Category
15+
Name="General">
16+
<Category.DisplayName>
17+
<sys:String>General</sys:String>
18+
</Category.DisplayName>
19+
</Category>
20+
<Category
21+
Name="Command Line"
22+
Subtype="CommandLine">
23+
<Category.DisplayName>
24+
<sys:String>Command Line</sys:String>
25+
</Category.DisplayName>
26+
</Category>
27+
</Rule.Categories>
28+
<StringListProperty
29+
Name="Inputs"
30+
Category="Command Line"
31+
IsRequired="true"
32+
Switch=" ">
33+
<StringListProperty.DataSource>
34+
<DataSource
35+
Persistence="ProjectFile"
36+
ItemType="png2c"
37+
SourceType="Item" />
38+
</StringListProperty.DataSource>
39+
</StringListProperty>
40+
<StringProperty
41+
Name="CommandLineTemplate"
42+
DisplayName="Command Line"
43+
Visible="False"
44+
IncludeInCommandLine="False" />
45+
<DynamicEnumProperty
46+
Name="png2cBeforeTargets"
47+
Category="General"
48+
EnumProvider="Targets"
49+
IncludeInCommandLine="False">
50+
<DynamicEnumProperty.DisplayName>
51+
<sys:String>Execute Before</sys:String>
52+
</DynamicEnumProperty.DisplayName>
53+
<DynamicEnumProperty.Description>
54+
<sys:String>Specifies the targets for the build customization to run before.</sys:String>
55+
</DynamicEnumProperty.Description>
56+
<DynamicEnumProperty.ProviderSettings>
57+
<NameValuePair
58+
Name="Exclude"
59+
Value="^png2cBeforeTargets|^Compute" />
60+
</DynamicEnumProperty.ProviderSettings>
61+
<DynamicEnumProperty.DataSource>
62+
<DataSource
63+
Persistence="ProjectFile"
64+
HasConfigurationCondition="true" />
65+
</DynamicEnumProperty.DataSource>
66+
</DynamicEnumProperty>
67+
<DynamicEnumProperty
68+
Name="png2cAfterTargets"
69+
Category="General"
70+
EnumProvider="Targets"
71+
IncludeInCommandLine="False">
72+
<DynamicEnumProperty.DisplayName>
73+
<sys:String>Execute After</sys:String>
74+
</DynamicEnumProperty.DisplayName>
75+
<DynamicEnumProperty.Description>
76+
<sys:String>Specifies the targets for the build customization to run after.</sys:String>
77+
</DynamicEnumProperty.Description>
78+
<DynamicEnumProperty.ProviderSettings>
79+
<NameValuePair
80+
Name="Exclude"
81+
Value="^png2cAfterTargets|^Compute" />
82+
</DynamicEnumProperty.ProviderSettings>
83+
<DynamicEnumProperty.DataSource>
84+
<DataSource
85+
Persistence="ProjectFile"
86+
ItemType=""
87+
HasConfigurationCondition="true" />
88+
</DynamicEnumProperty.DataSource>
89+
</DynamicEnumProperty>
90+
<StringListProperty
91+
Name="Outputs"
92+
DisplayName="Outputs"
93+
Visible="False"
94+
IncludeInCommandLine="False" />
95+
<StringProperty
96+
Name="ExecutionDescription"
97+
DisplayName="Execution Description"
98+
Visible="False"
99+
IncludeInCommandLine="False" />
100+
<StringListProperty
101+
Name="AdditionalDependencies"
102+
DisplayName="Additional Dependencies"
103+
IncludeInCommandLine="False"
104+
Visible="false" />
105+
<StringProperty
106+
Subtype="AdditionalOptions"
107+
Name="AdditionalOptions"
108+
Category="Command Line">
109+
<StringProperty.DisplayName>
110+
<sys:String>Additional Options</sys:String>
111+
</StringProperty.DisplayName>
112+
<StringProperty.Description>
113+
<sys:String>Additional Options</sys:String>
114+
</StringProperty.Description>
115+
</StringProperty>
116+
</Rule>
117+
<ItemType
118+
Name="png2c"
119+
DisplayName="PNG Compiler" />
120+
<FileExtension
121+
Name="*.png"
122+
ContentType="png2c" />
123+
<ContentType
124+
Name="png2c"
125+
DisplayName="PNG Compiler"
126+
ItemType="png2c" />
127+
</ProjectSchemaDefinitions>

0 commit comments

Comments
 (0)