Rearrange the build settings a bit and add update checker settings

This commit is contained in:
Thomas Goyne 2012-11-01 12:53:06 -07:00
parent b7e7a9054c
commit 45ff83637a
2 changed files with 44 additions and 77 deletions

View file

@ -28,8 +28,6 @@
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
Aegisub Project http://www.aegisub.org/ Aegisub Project http://www.aegisub.org/
$Id$
--> -->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
@ -192,7 +190,7 @@
<!-- Special builds --> <!-- Special builds -->
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<PreprocessorDefinitions Condition="'$(AegisubSpecialBuild)'=='StartupLog'">WITH_STARTUPLOG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(StartupLog)'=='true'">WITH_STARTUPLOG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -214,7 +212,7 @@
<!-- Add property pages --> <!-- Add property pages -->
<ItemGroup> <ItemGroup>
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)Aegisub.xml" /> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)Aegisub.xml" />
<ProjectTools Include="SubWCRev;CreateDefaultConfigurationHeader" /> <ProjectTools Include="AegisubConfig;CreateDefaultConfigurationHeader" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View file

@ -28,12 +28,10 @@
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
Aegisub Project http://www.aegisub.org/ Aegisub Project http://www.aegisub.org/
$Id$
--> -->
<Rule Name="SubWCRev" <Rule Name="AegisubConfig"
DisplayName="Aegisub" DisplayName="Aegisub"
Order="1" Order="1"
PageTemplate="tool" PageTemplate="tool"
xmlns="http://schemas.microsoft.com/build/2009/properties"> xmlns="http://schemas.microsoft.com/build/2009/properties">
@ -42,9 +40,9 @@
</Rule.DataSource> </Rule.DataSource>
<Rule.Categories> <Rule.Categories>
<Category Name="Features" DisplayName="Features" Description="Control features to build" /> <Category Name="Config" DisplayName="Configuration" Description="General build configuration" />
<Category Name="Features" DisplayName="External libraries" Description="Control which optional external libraries to use" />
<Category Name="Paths" DisplayName="Library paths" Description="Configure third-party library paths" /> <Category Name="Paths" DisplayName="Library paths" Description="Configure third-party library paths" />
<Category Name="BuildInfo" DisplayName="Build information" Description="Embed build information" />
</Rule.Categories> </Rule.Categories>
<BoolProperty <BoolProperty
@ -87,22 +85,14 @@
Category="Paths" Category="Paths"
DisplayName="FFmpegSource2 library path" DisplayName="FFmpegSource2 library path"
Description="Location of FFmpegSource2 library files" Description="Location of FFmpegSource2 library files"
> />
<StringProperty.DataSource>
<DataSource Persistence="UserFile" ItemType="" HasConfigurationCondition="true" />
</StringProperty.DataSource>
</StringProperty>
<StringProperty <StringProperty
Subtype="file" Subtype="file"
Name="FFmpegSourceLibraryName" Name="FFmpegSourceLibraryName"
Category="Paths" Category="Paths"
DisplayName="FFmpegSource2 library name" DisplayName="FFmpegSource2 library name"
Description="Name of FFmpegSource2 library" Description="Name of FFmpegSource2 library"
> />
<StringProperty.DataSource>
<DataSource Persistence="UserFile" ItemType="" HasConfigurationCondition="true" />
</StringProperty.DataSource>
</StringProperty>
<BoolProperty <BoolProperty
Name="AegisubUseFreetype2" Name="AegisubUseFreetype2"
@ -123,22 +113,14 @@
Category="Paths" Category="Paths"
DisplayName="Freetype 2 library path" DisplayName="Freetype 2 library path"
Description="Location of Freetype 2 library files" Description="Location of Freetype 2 library files"
> />
<StringProperty.DataSource>
<DataSource Persistence="UserFile" ItemType="" HasConfigurationCondition="true" />
</StringProperty.DataSource>
</StringProperty>
<StringProperty <StringProperty
Subtype="file" Subtype="file"
Name="Ft2LibraryName" Name="Ft2LibraryName"
Category="Paths" Category="Paths"
DisplayName="Freetype 2 library name" DisplayName="Freetype 2 library name"
Description="Name of Freetype 2 library" Description="Name of Freetype 2 library"
> />
<StringProperty.DataSource>
<DataSource Persistence="UserFile" ItemType="" HasConfigurationCondition="true" />
</StringProperty.DataSource>
</StringProperty>
<BoolProperty <BoolProperty
Name="AegisubUseFftw" Name="AegisubUseFftw"
@ -159,22 +141,14 @@
Category="Paths" Category="Paths"
DisplayName="FFTW library path" DisplayName="FFTW library path"
Description="Location of FFTW library files" Description="Location of FFTW library files"
> />
<StringProperty.DataSource>
<DataSource Persistence="UserFile" ItemType="" HasConfigurationCondition="true" />
</StringProperty.DataSource>
</StringProperty>
<StringProperty <StringProperty
Subtype="file" Subtype="file"
Name="FftwLibraryName" Name="FftwLibraryName"
Category="Paths" Category="Paths"
DisplayName="FFTW library name" DisplayName="FFTW library name"
Description="Name of FFTW library" Description="Name of FFTW library"
> />
<StringProperty.DataSource>
<DataSource Persistence="UserFile" ItemType="" HasConfigurationCondition="true" />
</StringProperty.DataSource>
</StringProperty>
<BoolProperty <BoolProperty
Name="AegisubUseLibass" Name="AegisubUseLibass"
@ -195,22 +169,14 @@
Category="Paths" Category="Paths"
DisplayName="libass library path" DisplayName="libass library path"
Description="Location of libass library files" Description="Location of libass library files"
> />
<StringProperty.DataSource>
<DataSource Persistence="UserFile" ItemType="" HasConfigurationCondition="true" />
</StringProperty.DataSource>
</StringProperty>
<StringProperty <StringProperty
Subtype="file" Subtype="file"
Name="LibassLibraryName" Name="LibassLibraryName"
Category="Paths" Category="Paths"
DisplayName="libass library name" DisplayName="libass library name"
Description="Name of libass library" Description="Name of libass library"
> />
<StringProperty.DataSource>
<DataSource Persistence="UserFile" ItemType="" HasConfigurationCondition="true" />
</StringProperty.DataSource>
</StringProperty>
<EnumProperty <EnumProperty
Name="AegisubUseCsri" Name="AegisubUseCsri"
@ -228,43 +194,46 @@
Category="Paths" Category="Paths"
DisplayName="External CSRI library path" DisplayName="External CSRI library path"
Description="Location of external CSRI library files, for when not using the CSRI helper library." Description="Location of external CSRI library files, for when not using the CSRI helper library."
> />
<StringProperty.DataSource>
<DataSource Persistence="UserFile" ItemType="" HasConfigurationCondition="true" />
</StringProperty.DataSource>
</StringProperty>
<StringProperty <StringProperty
Subtype="file" Subtype="file"
Name="CsriLibraryName" Name="CsriLibraryName"
Category="Paths" Category="Paths"
DisplayName="External CSRI library name" DisplayName="External CSRI library name"
Description="Name of external CSRI library, for when not using the CSRI helper library" Description="Name of external CSRI library, for when not using the CSRI helper library"
> />
<StringProperty.DataSource>
<DataSource Persistence="UserFile" ItemType="" HasConfigurationCondition="true" />
</StringProperty.DataSource>
</StringProperty>
<EnumProperty <BoolProperty
Name="AegisubSpecialBuild" Name="StartupLog"
DisplayName="Special build" DisplayName="Start-up logging"
Description="Make a special build of Aegisub, either enabling StartupLog to help end-users debug startup issues, or a Final Release whch displays version information differently." Description="Enable verbose startup logging to help figuration out where an error occurs"
Category="Features" Category="Config"
> />
<EnumValue Name="false" DisplayName="Make a regular build" Description="A regular developer build is made" />
<EnumValue Name="StartupLog" DisplayName="Start-up logging" Description="Show messages during start-up to figure out where an error occurs" />
</EnumProperty>
<StringProperty <StringProperty
Name="AegisubBuildCredit" Name="AegisubBuildCredit"
Category="BuildInfo" Category="Config"
DisplayName="Build credit" DisplayName="Build credit"
Description="Name the build should be credited to. Appears in the about box, and in the title bar of development builds." Description="Name the build should be credited to. Appears in the about box, and in the title bar of development builds."
Default="Anonymous" />
>
<StringProperty.DataSource> <BoolProperty
<DataSource Persistence="UserFile" ItemType="" HasConfigurationCondition="false" /> Name="AegisubUseUpdateChecker"
</StringProperty.DataSource> Category="Config"
</StringProperty> DisplayName="Enable Update Checker"
Description="Specify whether to enable the update checker. Should be disabled if you will be distributing builds via something that has its own update checking functionality."
/>
<StringProperty
Name="UpdateCheckerServer"
Category="Config"
DisplayName="Update Checker Server"
Description="Server name to connect to for updates."
/>
<StringProperty
Name="UpdateCheckerURL"
Category="Config"
DisplayName="Update Checker URL"
Description="URL to get for updates."
/>
</Rule> </Rule>