Add resources for all plugins, make Mike's configurator the default configurator for the package build.

This commit is contained in:
Ron Pedde 2006-05-29 11:07:19 +00:00
parent 7f08580a24
commit 69bb8dba82
17 changed files with 503 additions and 405 deletions

View File

@ -1,194 +1,112 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Version="7.10"
Name="FireflyShell"
ProjectGUID="{FC91423E-33F6-4037-95AC-A8BAD7DF599F}"
RootNamespace="FireflyShell"
>
ProjectGUID="{ED38F171-854B-4EA3-B3A0-7681648969FC}"
Keyword="Win32Proj">
<Platforms>
<Platform
Name="Win32"
/>
Name="Win32"/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="../Debug"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="1"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="..\versionize.bat"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="false"
TargetEnvironment="1"
GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/FireflyShell.tlb"
HeaderFileName="FireflyShell.h"
DLLDataFileName=""
InterfaceIdentifierFileName="FireflyShell_i.c"
ProxyFileName="FireflyShell_p.c"
/>
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_WINDOWS;STRICT;_DEBUG"
MinimalRebuild="true"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4"/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
/>
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="version.lib"
OutputFile="$(OutDir)/FireflyShell.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/FireflyShell.pdb"
SubSystem="2"
TargetMachine="1"
/>
TargetMachine="1"/>
<Tool
Name="VCALinkTool"
/>
Name="VCMIDLTool"/>
<Tool
Name="VCManifestTool"
/>
Name="VCPostBuildEventTool"/>
<Tool
Name="VCXDCMakeTool"
/>
Name="VCPreBuildEventTool"
CommandLine="..\versionize.bat"/>
<Tool
Name="VCBscMakeTool"
/>
Name="VCPreLinkEventTool"/>
<Tool
Name="VCFxCopTool"
/>
Name="VCResourceCompilerTool"/>
<Tool
Name="VCAppVerifierTool"
/>
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"
/>
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCPostBuildEventTool"
/>
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="../Release"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="1"
UseOfATL="1"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="..\versionize.bat"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="false"
TargetEnvironment="1"
GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/FireflyShell.tlb"
HeaderFileName="FireflyShell.h"
DLLDataFileName=""
InterfaceIdentifierFileName="FireflyShell_i.c"
ProxyFileName="FireflyShell_p.c"
/>
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;_WINDOWS;STRICT;NDEBUG"
ExceptionHandling="1"
RuntimeLibrary="0"
UsePrecompiledHeader="2"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="0"
/>
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
/>
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="version.lib"
OutputFile="$(OutDir)/FireflyShell.exe"
LinkIncremental="1"
GenerateDebugInformation="TRUE"
SubSystem="2"
TargetMachine="1"
/>
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"/>
<Tool
Name="VCALinkTool"
/>
Name="VCMIDLTool"/>
<Tool
Name="VCManifestTool"
/>
Name="VCPostBuildEventTool"/>
<Tool
Name="VCXDCMakeTool"
/>
Name="VCPreBuildEventTool"
CommandLine="..\versionize.bat"/>
<Tool
Name="VCBscMakeTool"
/>
Name="VCPreLinkEventTool"/>
<Tool
Name="VCFxCopTool"
/>
Name="VCResourceCompilerTool"/>
<Tool
Name="VCAppVerifierTool"
/>
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"
/>
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCPostBuildEventTool"
/>
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@ -196,173 +114,105 @@
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
>
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath=".\AboutPage.cpp"
>
RelativePath=".\AboutPage.cpp">
</File>
<File
RelativePath=".\AdvancedPage.cpp"
>
RelativePath=".\AdvancedPage.cpp">
</File>
<File
RelativePath=".\ConfigPage.cpp"
>
RelativePath=".\ConfigPage.cpp">
</File>
<File
RelativePath=".\DosPath.cpp"
>
RelativePath=".\DosPath.cpp">
</File>
<File
RelativePath=".\FireflyShell.cpp"
>
RelativePath=".\FireflyShell.cpp">
</File>
<File
RelativePath=".\LogPage.cpp"
>
RelativePath=".\LogPage.cpp">
</File>
<File
RelativePath=".\MainDlg.cpp"
>
RelativePath=".\MainDlg.cpp">
</File>
<File
RelativePath=".\NotifyIcon.cpp"
>
RelativePath=".\NotifyIcon.cpp">
</File>
<File
RelativePath=".\ServerEvents.cpp"
>
RelativePath=".\ServerEvents.cpp">
</File>
<File
RelativePath=".\ServiceControl.cpp"
>
RelativePath=".\ServiceControl.cpp">
</File>
<File
RelativePath=".\stdafx.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
RelativePath=".\stdafx.cpp">
</File>
<File
RelativePath=".\VersionInfo.cpp"
>
RelativePath=".\VersionInfo.cpp">
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc"
>
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
<File
RelativePath=".\AboutPage.h"
>
RelativePath=".\AboutPage.h">
</File>
<File
RelativePath=".\AdvancedPage.h"
>
RelativePath=".\AdvancedPage.h">
</File>
<File
RelativePath=".\ConfigPage.h"
>
RelativePath=".\ConfigPage.h">
</File>
<File
RelativePath=".\DosPath.h"
>
RelativePath=".\DosPath.h">
</File>
<File
RelativePath=".\FireflyShell.h"
>
RelativePath=".\FireflyShell.h">
</File>
<File
RelativePath=".\IniFile.h"
>
RelativePath=".\IniFile.h">
</File>
<File
RelativePath=".\LogPage.h"
>
RelativePath=".\LogPage.h">
</File>
<File
RelativePath=".\MainDlg.h"
>
RelativePath=".\MainDlg.h">
</File>
<File
RelativePath=".\NotifyIcon.h"
>
RelativePath=".\NotifyIcon.h">
</File>
<File
RelativePath=".\resource.h"
>
RelativePath=".\resource.h">
</File>
<File
RelativePath=".\ServerEvents.h"
>
RelativePath=".\ServerEvents.h">
</File>
<File
RelativePath=".\ServiceControl.h"
>
RelativePath=".\ServiceControl.h">
</File>
<File
RelativePath=".\singleton.h"
>
RelativePath=".\singleton.h">
</File>
<File
RelativePath=".\stdafx.h"
>
RelativePath=".\stdafx.h">
</File>
<File
RelativePath=".\VersionInfo.h"
>
RelativePath=".\VersionInfo.h">
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest"
>
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
<File
RelativePath=".\res\FireflyShell.ico"
>
</File>
<File
RelativePath=".\FireflyShell.rc"
>
</File>
<File
RelativePath=".\res\shellrunning.ico"
>
</File>
<File
RelativePath=".\res\shellstopped.ico"
>
</File>
<File
RelativePath=".\version.rc"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCResourceCompilerTool"
/>
</FileConfiguration>
RelativePath=".\FireflyShell.rc">
</File>
</Filter>
<File
RelativePath=".\README.txt"
>
RelativePath=".\README.txt">
</File>
</Files>
<Globals>

BIN
win32/ff.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

17
win32/mt-daapd-res.h Normal file
View File

@ -0,0 +1,17 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by mt-daapd.rc
//
#define IDI_APPICON 5
#define IDI_ICON1 201
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 202
#define _APS_NEXT_COMMAND_VALUE 32768
#define _APS_NEXT_CONTROL_VALUE 201
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

110
win32/mt-daapd.rc.templ Normal file
View File

@ -0,0 +1,110 @@
// Microsoft Visual C++ generated resource script.
//
#include "mt-daapd-res.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include <windows.h>
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"mt-daapd-res.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"#include ""res/Messages.rc""\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,$WCREV$
PRODUCTVERSION 1,0,0,$WCREV$
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x4L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://www.fireflymediaserver.org"
VALUE "CompanyName", "Ron Pedde"
VALUE "FileDescription", "Firefly Service"
VALUE "FileVersion", "1.0 svn-$WCREV$"
VALUE "InternalName", "firefly"
VALUE "LegalCopyright", "Copyright (C) 2006 Ron Pedde"
VALUE "OriginalFilename", "firefly.exe"
VALUE "ProductName", "Firefly Media Server"
VALUE "ProductVersion", "1.0 svn-$WCREV$"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_APPICON ICON "ff.ico"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
#include "res/Messages.rc"
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

View File

@ -7,10 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsp", "rsp.vcproj", "{68CCE
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FireflyConfig", "FireflyConfig\FireflyConfig.csproj", "{842826B0-521A-4296-B2B4-5746BF1C91C2}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w32-event", "w32-event.vcproj", "{E60F90F1-A1E5-49D8-A565-B990CA4BA860}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
@ -19,6 +15,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssc-ffmpeg", "ssc-ffmpeg.vc
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FireflyShell", "FireflyShell\FireflyShell.vcproj", "{ED38F171-854B-4EA3-B3A0-7681648969FC}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@ -33,10 +33,6 @@ Global
{68CCEA19-503F-4894-8AE3-B1673FDEA920}.Debug.Build.0 = Debug|Win32
{68CCEA19-503F-4894-8AE3-B1673FDEA920}.Release.ActiveCfg = Release|Win32
{68CCEA19-503F-4894-8AE3-B1673FDEA920}.Release.Build.0 = Release|Win32
{842826B0-521A-4296-B2B4-5746BF1C91C2}.Debug.ActiveCfg = Debug|.NET
{842826B0-521A-4296-B2B4-5746BF1C91C2}.Debug.Build.0 = Debug|.NET
{842826B0-521A-4296-B2B4-5746BF1C91C2}.Release.ActiveCfg = Release|.NET
{842826B0-521A-4296-B2B4-5746BF1C91C2}.Release.Build.0 = Release|.NET
{E60F90F1-A1E5-49D8-A565-B990CA4BA860}.Debug.ActiveCfg = Debug|Win32
{E60F90F1-A1E5-49D8-A565-B990CA4BA860}.Debug.Build.0 = Debug|Win32
{E60F90F1-A1E5-49D8-A565-B990CA4BA860}.Release.ActiveCfg = Release|Win32
@ -45,6 +41,10 @@ Global
{DA27D6F4-7E9F-40CA-AC5C-480DC81A1C56}.Debug.Build.0 = Debug|Win32
{DA27D6F4-7E9F-40CA-AC5C-480DC81A1C56}.Release.ActiveCfg = Release|Win32
{DA27D6F4-7E9F-40CA-AC5C-480DC81A1C56}.Release.Build.0 = Release|Win32
{ED38F171-854B-4EA3-B3A0-7681648969FC}.Debug.ActiveCfg = Debug|Win32
{ED38F171-854B-4EA3-B3A0-7681648969FC}.Debug.Build.0 = Debug|Win32
{ED38F171-854B-4EA3-B3A0-7681648969FC}.Release.ActiveCfg = Release|Win32
{ED38F171-854B-4EA3-B3A0-7681648969FC}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection

View File

@ -256,6 +256,9 @@
<File
RelativePath="..\src\ll.h">
</File>
<File
RelativePath=".\mt-daapd-res.h">
</File>
<File
RelativePath="..\src\os-win32.h">
</File>
@ -268,9 +271,6 @@
<File
RelativePath="..\src\rend.h">
</File>
<File
RelativePath=".\resource.h">
</File>
<File
RelativePath="..\src\strptime.h">
</File>
@ -297,6 +297,9 @@
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
<File
RelativePath=".\ff.ico">
</File>
<File
RelativePath=".\mt-daapd.rc">
<FileConfiguration

View File

@ -15,7 +15,7 @@
!define PROJROOT "..\..\.."
!define MTD_SOURCE "${PROJROOT}\mt-daapd\win32\Release"
!define DLL_SOURCE "${PROJROOT}\win32\dll"
!define CONFIG_SOURCE "${PROJROOT}\mt-daapd\win32\FireflyConfig\bin\Release"
!define CONFIG_SOURCE "${PROJROOT}\mt-daapd\win32\FireflyShell\Release"
!define ADMIN_ROOT "${PROJROOT}\mt-daapd\admin-root"
; MUI 1.67 compatible ------
@ -111,7 +111,7 @@ Section "MainSection" SEC01
SetOutPath "$2"
SetOverwrite ifnewer
File /oname=firefly.exe "${MTD_SOURCE}\mt-daapd.exe"
File "${CONFIG_SOURCE}\FireflyConfig.exe"
File "${CONFIG_SOURCE}\FireflyShell.exe"
File "${DLL_SOURCE}\gnu_regex.dll"
File "${DLL_SOURCE}\pthreadVC2.dll"
File "${DLL_SOURCE}\sqlite.dll"
@ -195,9 +195,8 @@ Section -AdditionalIcons
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" "$2\${PRODUCT_NAME}.url"
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$2\uninst.exe"
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Debug Mode.lnk" "$2\firefly.exe" "-d9 -f"
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Firefly Configuration.lnk" "$2\FireflyConfig.exe"
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Firefly Configuration.lnk" "$2\FireflyShell.exe"
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Advanced Configuration.lnk" "notepad.exe" "$2\mt-daapd.conf"
CreateShortCut "$SMPROGRAMS\Startup\Firefly Config.lnk" "$2\FireflyConfig.exe"
SectionEnd
Section -Post
@ -209,6 +208,8 @@ Section -Post
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "FireflyShell" '"$2\FireflyShell.exe" -q'
; ExecWait "$2\mt-daapd.exe -i"
nsSCM::Install "${PRODUCT_NAME}" "${PRODUCT_SERVICE}" 16 2 "$2\firefly.exe" "" "Bonjour Service" "" ""
@ -223,7 +224,7 @@ Section -Post
ExecWait 'netsh firewall add allowedprogram "$2\firefly.exe" "${PRODUCT_NAME}" enable'
nsSCM::Start "${PRODUCT_NAME}"
Exec "$2\FireflyConfig"
Exec "$2\FireflyShell.exe"
SectionEnd
@ -466,12 +467,11 @@ Section Uninstall
RMDir "$INSTDIR\plugins"
Delete "$INSTDIR\firefly.exe"
Delete "$INSTDIR\FireflyConfig.exe"
Delete "$INSTDIR\FireflyShell.exe"
Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
Delete "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk"
Delete "$SMPROGRAMS\${PRODUCT_NAME}\Debug Mode.lnk"
Delete "$SMPROGRAMS\Startup\Firefly Config.lnk"
Delete "$SMPROGRAMS\${PRODUCT_NAME}\Firefly Configuration.lnk"
Delete "$SMPROGRAMS\${PRODUCT_NAME}\Advanced Configuration.lnk"

View File

@ -1,27 +0,0 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by mt-daapd.rc
//
#define IDS_PROJNAME 100
#define IDR_WMDMLOGGER 101
#define IDS_LOG_SEV_INFO 201
#define IDS_LOG_SEV_WARN 202
#define IDS_LOG_SEV_ERROR 203
#define IDS_LOG_DATETIME 204
#define IDS_LOG_SRCNAME 205
#define IDS_DEF_LOGFILE 301
#define IDS_DEF_MAXSIZE 302
#define IDS_DEF_SHRINKTOSIZE 303
#define IDS_DEF_LOGENABLED 304
#define IDS_MUTEX_TIMEOUT 401
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 201
#define _APS_NEXT_COMMAND_VALUE 32768
#define _APS_NEXT_CONTROL_VALUE 201
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

15
win32/rsp-res.h Normal file
View File

@ -0,0 +1,15 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by w32-event.rc
//
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

View File

@ -1,101 +1,103 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include <windows.h>
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"#include ""res/Messages.rc""\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,3,0,0
PRODUCTVERSION 0,3,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x4L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://www.mt-daapd.org"
VALUE "CompanyName", "Ron Pedde"
VALUE "FileDescription", "Multi-Threaded DAAP Server"
VALUE "FileVersion", "0, 3, 0, 0"
VALUE "InternalName", "mt-daapd"
VALUE "LegalCopyright", "Copyright (C) 2006 Ron Pedde"
VALUE "OriginalFilename", "mt-daapd.exe"
VALUE "ProductName", "mt-daapd"
VALUE "ProductVersion", "0, 3, 0, 0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
#include "res/Messages.rc"
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
// Microsoft Visual C++ generated resource script.
//
#include "rsp-res.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,$WCREV$
PRODUCTVERSION 1,0,0,$WCREV$
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x4L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://www.fireflymediaserver.org"
VALUE "CompanyName", "Ron Pedde"
VALUE "FileDescription", "RSP Output Plugin"
VALUE "FileVersion", "1.0 svn-$WCREV$"
VALUE "InternalName", "rsp"
VALUE "LegalCopyright", "Copyright (C) 2006 Ron Pedde"
VALUE "OriginalFilename", "rsp.dll"
VALUE "ProductName", "Firefly Media Server"
VALUE "ProductVersion", "1.0 svn-$WCREV$"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

View File

@ -47,7 +47,8 @@
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
Name="VCPreBuildEventTool"
CommandLine="versionize.bat"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
@ -98,7 +99,8 @@
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
Name="VCPreBuildEventTool"
CommandLine="versionize.bat"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
@ -153,6 +155,9 @@
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
<File
RelativePath=".\rsp.rc">
</File>
</Filter>
</Files>
<Globals>

View File

@ -69,8 +69,9 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Firefly Media Server"
VALUE "FileDescription", "ffmpeg transcoder"
VALUE "Comments", "http://www.fireflymediaserver.org"
VALUE "CompanyName", "Ron Pedde"
VALUE "FileDescription", "FFMPEG Transcoder Plugin"
VALUE "FileVersion", "1.0 svn-$WCREV$"
VALUE "InternalName", "ssc-ffmpeg"
VALUE "LegalCopyright", "Copyright (C) 2006 Ron Pedde"

View File

@ -46,7 +46,8 @@
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
Name="VCPreBuildEventTool"
CommandLine="versionize.bat"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
@ -96,7 +97,8 @@
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
Name="VCPreBuildEventTool"
CommandLine="versionize.bat"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool

View File

@ -1,20 +1,14 @@
@echo off
set SUBWC="c:\program files\tortoisesvn\bin\subwcrev.exe"
if not exist %SUBWC% goto NOSUBWC
if not exist %SUBWC% set SUBWC=copy
echo Fixing version info...
%SUBWC% %0\..\.. %0\..\config.h.templ %0\..\config.h
%SUBWC% %0\..\.. %0\..\FireflyConfig\AssemblyInfo.cs.templ %0\..\FireflyConfig\AssemblyInfo.cs
%SUBWC% %0\..\.. %0\..\nsi\mt-daapd.nsi.templ %0\..\nsi\mt-daapd.nsi
%SUBWC% %0\..\.. %0\..\ssc-ffmpeg.rc.templ %0\..\ssc-ffmpeg.rc
%SUBWC% %0\..\.. %0\..\mt-daapd.rc.templ %0\..\mt-daapd.rc
%SUBWC% %0\..\.. %0\..\rsp.rc.templ %0\..\rsp.rc
%SUBWC% %0\..\.. %0\..\w32-event.rc.templ %0\..\w32-event.rc
%SUBWC% %0\..\.. %0\..\FireflyShell\version.h.templ %0\..\FireflyShell\version.h
goto END
:NOSUBWC
copy %0\..\config.h.templ %0\..\config.h
copy %0\..\FireflyConfig\AssemblyInfo.cs.templ %0\..\FireflyConfig\AssemblyInfo.cs
copy %0\..\nsi\mt-daapd.nsi.templ %0\..\nsi\mt-daapd.nsi
copy %0\..\.. %0\..\ssc-ffmpeg.rc.templ %0\..\ssc-ffmpeg.rc
copy %0\..\FireflyShell\version.h.templ %0\..\version.h
:END

15
win32/w32-event-res.h Normal file
View File

@ -0,0 +1,15 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by w32-event.rc
//
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

103
win32/w32-event.rc.templ Normal file
View File

@ -0,0 +1,103 @@
// Microsoft Visual C++ generated resource script.
//
#include "w32-event-res.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,$WCREV$
PRODUCTVERSION 1,0,0,$WCREV$
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x4L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "http://www.fireflymediaserver.org"
VALUE "CompanyName", "Ron Pedde"
VALUE "FileDescription", "Win32 Event Plugin"
VALUE "FileVersion", "1.0 svn-$WCREV$"
VALUE "InternalName", "w32-event"
VALUE "LegalCopyright", "Copyright (C) 2006 Ron Pedde"
VALUE "OriginalFilename", "w32-event.dll"
VALUE "ProductName", "Firefly Media Server"
VALUE "ProductVersion", "1.0 svn-$WCREV$"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

View File

@ -47,7 +47,8 @@
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
Name="VCPreBuildEventTool"
CommandLine="versionize.bat"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
@ -97,7 +98,8 @@
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
Name="VCPreBuildEventTool"
CommandLine="versionize.bat"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
@ -135,11 +137,17 @@
<File
RelativePath="..\src\plugins\mtd-plugins.h">
</File>
<File
RelativePath=".\resource.h">
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
<File
RelativePath=".\w32-event.rc">
</File>
</Filter>
</Files>
<Globals>