[xiph-commits] r12627 - trunk/ezstream/win32
moritz at svn.xiph.org
moritz at svn.xiph.org
Sun Mar 4 06:29:31 PST 2007
Author: moritz
Date: 2007-03-04 06:29:27 -0800 (Sun, 04 Mar 2007)
New Revision: 12627
Added:
trunk/ezstream/win32/config.h
Modified:
trunk/ezstream/win32/Makefile.am
trunk/ezstream/win32/README.win32
trunk/ezstream/win32/ezstream.1.html
trunk/ezstream/win32/ezstream.sln
trunk/ezstream/win32/ezstream.vcproj
Log:
Yay. I finally managed to build a statically linked and self-contained
ezstream.exe. Update, and regen the HTML man page for -V.
Modified: trunk/ezstream/win32/Makefile.am
===================================================================
--- trunk/ezstream/win32/Makefile.am 2007-03-04 14:27:37 UTC (rev 12626)
+++ trunk/ezstream/win32/Makefile.am 2007-03-04 14:29:27 UTC (rev 12627)
@@ -1,5 +1,6 @@
AUTOMAKE_OPTIONS = 1.9 foreign
-EXTRA_DIST = README.win32 ezstream.1.html ezstream.sln ezstream.vcproj
+EXTRA_DIST = README.win32 config.h ezstream.1.html ezstream.sln \
+ ezstream.vcproj
CLEANFILES = core *.core *~ .*~
Modified: trunk/ezstream/win32/README.win32
===================================================================
--- trunk/ezstream/win32/README.win32 2007-03-04 14:27:37 UTC (rev 12626)
+++ trunk/ezstream/win32/README.win32 2007-03-04 14:29:27 UTC (rev 12627)
@@ -15,12 +15,8 @@
| | automatically generated and looks very bad, |
| | but should be readable enough to be useful. |
+-----------------------+----------------------------------------------+
-| \bin\ezstream.exe | The ezstream executable file. |
+| \ezstream.exe | The ezstream executable file. |
+-----------------------+----------------------------------------------+
-| \bin\*.dll | .DLL libraries required by ezstream. These |
-| | need to be located in the same directory as |
-| | the ezstream.exe executable. |
-+-----------------------+----------------------------------------------+
| \conf\*.xml | Ezstream example configuration files. |
+-----------------------+----------------------------------------------+
@@ -33,23 +29,20 @@
As of version 0.3.0, ezstream no longer comes with an installer. If you have a
previous version of ezstream installed, you might want to simply uninstall it.
-The ezstream.exe file will simply work as long as libxml2.dll, iconv.dll and
-zlib.dll are located in the same directory.
+The ezstream.exe file will work from any location. To install it, simply copy
+it to a location of your choosing. Add this place to your PATH environment
+variable, if ezstream.exe is supposed to be executable from anywhere on the
+system.
-To install ezstream, simply copy the contents of the \bin directory in this
-archive to a location of your choosing.
-
3. Source code
--------------
Ezstream uses libxml2 (http://xmlsoft.org/, BSD-like license), libogg and
libvorbis (http://www.vorbis.com/, BSD-like license) and libshout
-(http://www.icecast.org/, LGPL licensed). Also, libxml2 depends on zlib
-(http://zlib.net/, BSD-like license) and libiconv
-(http://www.gnu.org/software/libiconv/, LGPL licensed.)
+(http://www.icecast.org/, LGPL licensed).
Ezstream itself is licensed under the GPL (see COPYING.txt), with the source
code available at http://www.icecast.org/ezstream.php in the distribution
Added: trunk/ezstream/win32/config.h
===================================================================
--- trunk/ezstream/win32/config.h 2007-03-04 14:27:37 UTC (rev 12626)
+++ trunk/ezstream/win32/config.h 2007-03-04 14:29:27 UTC (rev 12627)
@@ -0,0 +1,29 @@
+#define HAVE_INTTYPES_H 1
+#define HAVE_STAT 1
+#define HAVE_STDINT_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TYPES_H 1
+
+/* Name of package */
+#define PACKAGE "ezstream"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "grmo at users.sourceforge.net"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "ezstream"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "ezstream 0.3.0"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "ezstream"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.3.0"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "0.3.0"
Modified: trunk/ezstream/win32/ezstream.1.html
===================================================================
--- trunk/ezstream/win32/ezstream.1.html 2007-03-04 14:27:37 UTC (rev 12626)
+++ trunk/ezstream/win32/ezstream.1.html 2007-03-04 14:29:27 UTC (rev 12627)
@@ -10,7 +10,7 @@
<a href="#FILES">FILES</a><br>
<a href="#AUTHORS">AUTHORS</a><br>
<!-- Creator : groff version 1.15 -->
-<!-- CreationDate: Sat Mar 3 20:44:03 2007
+<!-- CreationDate: Sun Mar 4 15:24:39 2007
-->
<!-- Total number of pages: 4 -->
<!-- Page: 1 -->
@@ -18,7 +18,7 @@
<!-- right margin: 750 -->
<p><font size=3>EZSTREAM ( 1 ) OpenBSD Reference Manual EZSTREAM ( 1 )</p>
<a name="NAME"></a><h2>NAME</h2><p><span style=" text-indent: 0.4500in;"></span><font size=3><tt><B>ezstream</tt></B> <font size=3>- source client for Icecast with external en-/decoder support</p>
-<a name="SYNOPSIS"></a><h2>SYNOPSIS</h2><p><span style=" text-indent: 0.4500in;"></span><font size=3><tt><B>ezstream</tt></B> <font size=3>[ <font size=3><tt><B>-hqv</tt></B> <font size=3>] [ <font size=3><tt><B>-c</tt></B> <font size=3><tt><I>configfile</tt></I> <font size=3>]</p>
+<a name="SYNOPSIS"></a><h2>SYNOPSIS</h2><p><span style=" text-indent: 0.4500in;"></span><font size=3><tt><B>ezstream</tt></B> <font size=3>[ <font size=3><tt><B>-hqVv</tt></B> <font size=3>] [ <font size=3><tt><B>-c</tt></B> <font size=3><tt><I>configfile</tt></I> <font size=3>]</p>
<a name="DESCRIPTION"></a><h2>DESCRIPTION</h2>
<table width="100%" rules="none" frame="none" cols="2">
<tr valign="top" align="left">
@@ -35,6 +35,7 @@
<span style=" text-indent: 0.6800in;"></span></tt></I>Use the XML configuration in <font size=3><tt><I>configfile</tt></I><font size=3>. ( Mandatory. )</p>
<p><span style=" text-indent: 0.2700in;"></span><font size=3><tt><B>-h</tt></B> <font size=3>Print a summary of available command line parameters with short descriptions and exit.</p>
<p><span style=" text-indent: 0.2700in;"></span><font size=3><tt><B>-q</tt></B> <font size=3>Be more quiet. Suppress the output that external programs send to standard error.</p>
+<p><span style=" text-indent: 0.2700in;"></span><font size=3><tt><B>-V</tt></B> <font size=3>Print the <font size=3><tt><B>ezstream</tt></B> <font size=3>version number and exit.</p>
<p><span style=" text-indent: 0.2700in;"></span><font size=3><tt><B>-v</tt></B> <font size=3>Produce more verbose output from <font size=3><tt><B>ezstream</tt></B><font size=3>. Use twice for even more verbose output.</p>
<p><span style=" text-indent: 0.2500in;"></span><font size=3>When the <font size=3><tt><B>-q</tt></B> <font size=3>and <font size=3><tt><B>-v</tt></B> <font size=3>parameters are provided simultaneously, an additional line of information about the<br>
<span style=" text-indent: 0.2500in;"></span>currently streamed file -- playlist position, approximate playing time and bitrate -- is displayed.</p>
Modified: trunk/ezstream/win32/ezstream.sln
===================================================================
--- trunk/ezstream/win32/ezstream.sln 2007-03-04 14:27:37 UTC (rev 12626)
+++ trunk/ezstream/win32/ezstream.sln 2007-03-04 14:29:27 UTC (rev 12627)
@@ -32,8 +32,13 @@
ProjectSection(ProjectDependencies) = postProject
{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9} = {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}
{376BDB5E-7092-44EC-AF16-C087D2D80FC6} = {376BDB5E-7092-44EC-AF16-C087D2D80FC6}
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1} = {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\libxml2\win32\VC7\libxml2.vcproj", "{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -168,6 +173,26 @@
{4C27B249-0C17-4007-9D51-2ED145DF06C2}.LIB Release.Build.0 = Release|Win32
{4C27B249-0C17-4007-9D51-2ED145DF06C2}.Release.ActiveCfg = Release|Win32
{4C27B249-0C17-4007-9D51-2ED145DF06C2}.Release.Build.0 = Release|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Debug.ActiveCfg = Debug|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Debug.Build.0 = Debug|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL ASM Debug.ActiveCfg = Debug|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL ASM Debug.Build.0 = Debug|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL ASM Release.ActiveCfg = Release|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL ASM Release.Build.0 = Release|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL Debug.ActiveCfg = Debug|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL Debug.Build.0 = Debug|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL Release.ActiveCfg = Release|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.DLL Release.Build.0 = Release|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB ASM Debug.ActiveCfg = Debug|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB ASM Debug.Build.0 = Debug|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB ASM Release.ActiveCfg = Release|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB ASM Release.Build.0 = Release|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB Debug.ActiveCfg = Debug|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB Debug.Build.0 = Debug|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB Release.ActiveCfg = Release|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.LIB Release.Build.0 = Release|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Release.ActiveCfg = Release|Win32
+ {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
Modified: trunk/ezstream/win32/ezstream.vcproj
===================================================================
--- trunk/ezstream/win32/ezstream.vcproj 2007-03-04 14:27:37 UTC (rev 12626)
+++ trunk/ezstream/win32/ezstream.vcproj 2007-03-04 14:29:27 UTC (rev 12627)
@@ -23,8 +23,8 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../../ogg/include,../../vorbis/include,../../shout/include,../src,../../../include"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_SYS_TYPES_H;HAVE_SYS_STAT_H;HAVE_STAT"
+ AdditionalIncludeDirectories="../../ogg/include;../../vorbis/include;../../shout/include;../src;../../libxml2/include;."
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"
StringPooling="TRUE"
ExceptionHandling="FALSE"
BasicRuntimeChecks="0"
@@ -43,11 +43,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\shout\win32\Release\libshout.lib ogg_static.lib vorbis_static.lib ws2_32.lib winmm.lib libxml2.lib iconv.lib vorbisfile_static.lib"
+ AdditionalDependencies="odbc32.lib odbccp32.lib libshout.lib ogg_static.lib vorbis_static.lib ws2_32.lib winmm.lib libxml2.lib vorbisfile_static.lib"
OutputFile=".\Release/ezstream.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="../../theora/win32/Static_Release,../../shout/win32/Static_Release,../../../lib,../../ogg/win32/Static_Release,../../vorbis/win32/Vorbis_Static_Release,../../vorbis/win32/VorbisFile_Static_Release"
+ AdditionalLibraryDirectories="../../theora/win32/Static_Release,../../shout/win32/Release,../../ogg/win32/Static_Release,../../vorbis/win32/Vorbis_Static_Release,../../vorbis/win32/VorbisFile_Static_Release,../../libxml2/win32/VC7/Release"
IgnoreDefaultLibraryNames="libcmt.lib;msvcrt.lib;libcd.lib;libcmtd.lib;msvcrtd.lib"
ProgramDatabaseFile=".\Release/ezstream.pdb"
SubSystem="1"
@@ -91,8 +91,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../ogg/include,../../vorbis/include,../../shout/include,../src,../../../include"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_SYS_TYPES_H;HAVE_SYS_STAT_H;HAVE_STAT"
+ AdditionalIncludeDirectories="../../ogg/include,../../vorbis/include,../../shout/include,../src,../../libxml2/include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
ExceptionHandling="FALSE"
BasicRuntimeChecks="0"
RuntimeLibrary="4"
@@ -236,6 +236,9 @@
RelativePath="..\src\compat.h">
</File>
<File
+ RelativePath=".\config.h">
+ </File>
+ <File
RelativePath="..\src\configfile.h">
</File>
<File
More information about the commits
mailing list