[xiph-commits] r14464 - in icecast/branches/kh/icecast: . src win32
karl at svn.xiph.org
karl at svn.xiph.org
Sun Feb 10 14:20:09 PST 2008
Author: karl
Date: 2008-02-10 14:20:07 -0800 (Sun, 10 Feb 2008)
New Revision: 14464
Added:
icecast/branches/kh/icecast/config.h.vc6
Modified:
icecast/branches/kh/icecast/Makefile.am
icecast/branches/kh/icecast/NEWS
icecast/branches/kh/icecast/configure.in
icecast/branches/kh/icecast/src/cfgfile.c
icecast/branches/kh/icecast/src/client.c
icecast/branches/kh/icecast/src/fnmatch.c
icecast/branches/kh/icecast/src/main.c
icecast/branches/kh/icecast/src/xslt.c
icecast/branches/kh/icecast/win32/Icecast2win.dsp
icecast/branches/kh/icecast/win32/Icecast2winDlg.cpp
icecast/branches/kh/icecast/win32/Makefile.am
icecast/branches/kh/icecast/win32/icecast.dsp
icecast/branches/kh/icecast/win32/icecast2.iss
icecast/branches/kh/icecast/win32/icecast2_console.dsp
Log:
sync up work. crash case on on-demand relay failure fixed, a win32 build update
and some lib initialization fixes
Modified: icecast/branches/kh/icecast/Makefile.am
===================================================================
--- icecast/branches/kh/icecast/Makefile.am 2008-02-09 11:16:55 UTC (rev 14463)
+++ icecast/branches/kh/icecast/Makefile.am 2008-02-10 22:20:07 UTC (rev 14464)
@@ -5,7 +5,7 @@
SUBDIRS = src conf debian doc web admin win32
-EXTRA_DIST = HACKING m4/acx_pthread.m4 m4/ogg.m4 \
+EXTRA_DIST = HACKING config.h.vc6 m4/acx_pthread.m4 m4/ogg.m4 \
m4/theora.m4 m4/vorbis.m4 m4/speex.m4\
m4/xiph_compiler.m4 m4/xiph_curl.m4 m4/xiph_net.m4 \
m4/xiph_types.m4 m4/xiph_xml2.m4 m4/xiph_openssl.m4 icecast.spec
Modified: icecast/branches/kh/icecast/NEWS
===================================================================
--- icecast/branches/kh/icecast/NEWS 2008-02-09 11:16:55 UTC (rev 14463)
+++ icecast/branches/kh/icecast/NEWS 2008-02-10 22:20:07 UTC (rev 14464)
@@ -10,12 +10,25 @@
max-listener/bandwidth check
. mount can filter out theora content, useful for defining a local relay
of a theora+vorbis stream to have a vorbis only stream from the same source.
-. multiple shoutcast source clients possible.
. stream-auth/handlers option for url authenticator.
any extra tags are show in the conf/icecast.xml.dist file
+2.3-kh32
+. crash fix for a failing on-demand relay.
+. incorrect logfile settings for timestamp setting, for playlist and access.log
+. update for win32 build and initialization.
+
+2.3-kh31
+. hard to trigger but possible race condition on source startup.
+. long standing bug identified with many descriptors (eg > 1024 listeners)
+. allow YP thread to skip a non-responsive server.
+
+2.3-kh30
+. crash fix if no user/pass supplied when stream_auth in use.
+. the admin=1 was not passed in POST for stream_auth on metadata updates
+
2.3-kh29
. some small code re-organisation in kh28 caused auth htpasswd to fail new
listeners
Added: icecast/branches/kh/icecast/config.h.vc6
===================================================================
--- icecast/branches/kh/icecast/config.h.vc6 (rev 0)
+++ icecast/branches/kh/icecast/config.h.vc6 2008-02-10 22:20:07 UTC (rev 14464)
@@ -0,0 +1,156 @@
+/* config.h. Generated by configure. */
+/* config.h.in. Generated from configure.in by autoheader. */
+
+/* Define to 1 if you have the `atoll' function. */
+#define HAVE_ATOLL 1
+
+/* Define to compile in auth URL support code */
+#define HAVE_AUTH_URL 1
+
+/* Define if you have libcurl. */
+#define HAVE_CURL 1
+
+/* Define to 1 if you have the <curl/curl.h> header file. */
+#define HAVE_CURL_CURL_H 1
+
+/* Define to 1 if you have the `inet_aton' function. */
+#define HAVE_INET_ATON 1
+
+/* Define to 1 if you have the `localtime_r' function. */
+#define HAVE_LOCALTIME_R 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define if you have nanosleep */
+#define HAVE_NANOSLEEP 1
+
+/* Define if you have libogg installed */
+#define HAVE_OGG 1
+
+/* Define if you have libopenssl. */
+#define HAVE_OPENSSL 1
+
+/* Define if you have POSIX threads libraries and header files. */
+#define HAVE_PTHREAD 1
+
+/* Define to 1 if the system has the type `pthread_rwlock_t'. */
+#define HAVE_PTHREAD_RWLOCK_T 1
+
+/* Define to 1 if the system has the function pthread_spin_lock */
+#define HAVE_PTHREAD_SPIN_LOCK 1
+
+/* Define to 1 if you have the <pwd.h> header file. */
+#define HAVE_PWD_H 1
+
+/* Define if Speex support is available */
+#define HAVE_SPEEX 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strtoll' function. */
+#define HAVE_STRTOLL 1
+
+/* Define to 1 if the system has the type `struct ovectl_ratemanage_arg'. */
+#define HAVE_STRUCT_OVECTL_RATEMANAGE_ARG 1
+
+/* Define to 1 if `ss_family' is member of `struct sockaddr_storage'. */
+#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define if Theora support is available */
+#define HAVE_THEORA 1
+
+/* Define if you have winsock2.h on MINGW */
+#define HAVE_WINSOCK2_H 1
+
+/* Define to 1 if you have the `xsltSaveResultToString' function. */
+#define HAVE_XSLTSAVERESULTTOSTRING 1
+
+/* Define to 1 if you have the fnmatch.h header file */
+#define HAVE_FNMATCH_H 1
+
+/* Name of package */
+#define PACKAGE "icecast"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "karl at xiph.org"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "Icecast"
+
+/* Version number of package */
+#define VERSION "2.3-kh32"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION VERSION
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING PACKAGE_NAME PACKAGE_VERSION
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "icecast"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to compile in YP support code */
+#define USE_YP 1
+
+typedef unsigned int socklen_t;
+#define uint64_t unsigned __int64
+#define int64_t __int64
+
+/* Replace __func__ if not supported */
+#define __func__ ""
+
+/* define if va_copy is not available */
+#define va_copy(ap1, ap2) memcpy(&ap1, &ap2, sizeof(va_list))
+
+/* define if vsnprintf returns -1 if truncation occurs */
+#define HAVE_OLD_VSNPRINTF 1
+
+/* define if compiler does not handle __attribute__ keyword */
+#define __attribute__(x)
+
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+
+#define snprintf _snprintf
+#define vsnprintf _vsnprintf
+#define getpid _getpid
+#define atoll _atoi64
+
+#define fseeko fseek
+#define PRIdMAX "ld"
+#define SCNdMAX "ld"
+
+#define PRId64 "I64d"
+#define PRIu64 "I64u"
+#define SCNd64 "I64d"
+
+#define bool int
+#define false 0
+#define true 1
+#define alloca _alloca
+
+#define S_ISREG(mode) ((mode)&_S_IFREG)
+
+#define MIMETYPESFILE ".\\mime.types"
+
+#define HAVE_SYS_TIMEB_H 1
+
+#define sock_t SOCKET
+
Modified: icecast/branches/kh/icecast/configure.in
===================================================================
--- icecast/branches/kh/icecast/configure.in 2008-02-09 11:16:55 UTC (rev 14463)
+++ icecast/branches/kh/icecast/configure.in 2008-02-10 22:20:07 UTC (rev 14464)
@@ -1,4 +1,4 @@
-AC_INIT([Icecast], [2.3-kh29], [karl at xiph.org])
+AC_INIT([Icecast], [2.3-kh32], [karl at xiph.org])
AC_PREREQ(2.59)
AC_CONFIG_SRCDIR(src/main.c)
Modified: icecast/branches/kh/icecast/src/cfgfile.c
===================================================================
--- icecast/branches/kh/icecast/src/cfgfile.c 2008-02-09 11:16:55 UTC (rev 14463)
+++ icecast/branches/kh/icecast/src/cfgfile.c 2008-02-10 22:20:07 UTC (rev 14464)
@@ -874,6 +874,11 @@
{ "redirect", config_get_bool, &config->master_redirect },
{ NULL, NULL, NULL },
};
+
+ if (parse_xml_tags (node, icecast_tags))
+ return -1;
+
+ return 0;
}
Modified: icecast/branches/kh/icecast/src/client.c
===================================================================
--- icecast/branches/kh/icecast/src/client.c 2008-02-09 11:16:55 UTC (rev 14463)
+++ icecast/branches/kh/icecast/src/client.c 2008-02-10 22:20:07 UTC (rev 14464)
@@ -251,6 +251,8 @@
}
if (message == NULL)
message = "Not Available";
+ if (client->refbuf == NULL)
+ client->refbuf = refbuf_new (4096);
snprintf (client->refbuf->data, PER_CLIENT_REFBUF_SIZE,
"HTTP/1.0 404 Not Available\r\n"
"Content-Type: text/html\r\n\r\n"
Modified: icecast/branches/kh/icecast/src/fnmatch.c
===================================================================
--- icecast/branches/kh/icecast/src/fnmatch.c 2008-02-09 11:16:55 UTC (rev 14463)
+++ icecast/branches/kh/icecast/src/fnmatch.c 2008-02-10 22:20:07 UTC (rev 14464)
@@ -30,19 +30,16 @@
#include <fnmatch.h>
-#if 0
-#ifdef HAVE_FNMATCH_H
-#include <fnmatch.h>
-#endif
#ifdef HAVE_FNMATCH__H
#include "fnmatch_.h"
#endif
-
-#ifdef WIN32
+
+/* ugly hack needed in some win32 build cases */
+#ifdef WIN32
int __mb_cur_max;
unsigned short* _pctype;
#endif
-#endif
+
#ifdef HAVE_ALLOCA_H
#include <alloca.h>
#endif
Modified: icecast/branches/kh/icecast/src/main.c
===================================================================
--- icecast/branches/kh/icecast/src/main.c 2008-02-09 11:16:55 UTC (rev 14463)
+++ icecast/branches/kh/icecast/src/main.c 2008-02-10 22:20:07 UTC (rev 14464)
@@ -104,13 +104,21 @@
connection_initialize();
global_initialize();
refbuf_initialize();
+#if !defined(WIN32) || defined(WIN32_SERVICE)
+ /* win32 GUI needs to do the initialise before here */
xslt_initialize();
+ curl_global_init (CURL_GLOBAL_ALL);
+#endif
}
static void _shutdown_subsystems(void)
{
fserve_shutdown();
+#if !defined(WIN32) || defined(WIN32_SERVICE)
+ /* If we do the following cleanup on the win32 GUI then the app will crash when libxml2 is
+ * initialised again as the process doesn't terminate */
xslt_shutdown();
+#endif
refbuf_shutdown();
slave_shutdown();
auth_shutdown();
@@ -125,11 +133,6 @@
thread_shutdown();
DEBUG0 ("library cleanups");
-#ifdef WIN32
- thread_sleep (500000);
-#else
- xmlCleanupParser();
-#endif
#ifdef HAVE_CURL
curl_global_cleanup();
#endif
@@ -227,7 +230,7 @@
log_to_stderr = 0;
if (config->logsize)
log_set_trigger (accesslog, config->logsize);
- log_set_archive_timestamp(errorlog, config->logarchive);
+ log_set_archive_timestamp(accesslog, config->logarchive);
} else {
accesslog = log_open_file(stderr);
log_to_stderr = 1;
@@ -256,7 +259,7 @@
log_to_stderr = 0;
if (config->logsize)
log_set_trigger (playlistlog, config->logsize);
- log_set_archive_timestamp(errorlog, config->logarchive);
+ log_set_archive_timestamp(playlistlog, config->logarchive);
} else {
playlistlog = -1;
}
Modified: icecast/branches/kh/icecast/src/xslt.c
===================================================================
--- icecast/branches/kh/icecast/src/xslt.c 2008-02-09 11:16:55 UTC (rev 14463)
+++ icecast/branches/kh/icecast/src/xslt.c 2008-02-10 22:20:07 UTC (rev 14464)
@@ -111,6 +111,7 @@
}
thread_mutex_destroy (&xsltlock);
+ xmlCleanupParser();
xsltCleanupGlobals();
}
Modified: icecast/branches/kh/icecast/win32/Icecast2win.dsp
===================================================================
--- icecast/branches/kh/icecast/win32/Icecast2win.dsp 2008-02-09 11:16:55 UTC (rev 14463)
+++ icecast/branches/kh/icecast/win32/Icecast2win.dsp 2008-02-10 22:20:07 UTC (rev 14464)
@@ -38,12 +38,12 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 5
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "win_release"
+# PROP Intermediate_Dir "win_release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../src" /I "../src/httpp" /I "../src/thread" /I "../src/log" /I "../src/avl" /I "../src/net" /I "src/timings" /I "../" /I ".." /I "..\src" /D "NDEBUG" /D "_WINDOWS" /D HAVE_CONFIG_H=1 /D "WIN32" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "../src" /I "../src/httpp" /I "../src/thread" /I "../src/log" /I "../src/avl" /I "../src/net" /I "src/timings" /I "../" /I ".." /I "..\src" /D "NDEBUG" /D "_WINDOWS" /D HAVE_CONFIG_H=1 /D "WIN32" /D "_MBCS" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,8 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 Releaseicecast\icecast.lib libcurl.lib ogg_static_d.lib vorbis_static.lib theora_static_d.lib libspeex.lib libxml2.lib libxslt.lib iconv.lib pthreadVSE.lib ws2_32.lib winmm.lib ssleay32MT.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmtd.lib" /out:"Release/Icecast2.exe"
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 libspeex.lib theora_static_d.lib ogg_static_d.lib vorbis_static_d.lib pthreadVSE.lib ssleay32MT.lib libcurl.lib libxml2.lib libxslt.lib iconv.lib ws2_32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmtd.lib"
!ELSEIF "$(CFG)" == "Icecast2win - Win32 Debug"
@@ -63,25 +62,25 @@
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
-# PROP Use_MFC 6
+# PROP Use_MFC 5
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "win_debug"
+# PROP Intermediate_Dir "win_debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../src" /I "../src/httpp" /I "../src/thread" /I "../src/log" /I "../src/avl" /I "../src/net" /I "src/timings" /I "../" /I ".." /I "..\src" /D "_DEBUG" /D "_WIN32" /D "_AFXDLL" /D "_WINDOWS" /D HAVE_CONFIG_H=1 /D "WIN32" /D "_MBCS" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../src" /I "../src/httpp" /I "../src/thread" /I "../src/log" /I "../src/avl" /I "../src/net" /I "src/timings" /I "../" /I ".." /I "..\src" /D "_DEBUG" /D "_WIN32" /D "_WINDOWS" /D HAVE_CONFIG_H=1 /D "WIN32" /D "_MBCS" /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
+# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 Debugicecast\icecast.lib libcurl.lib ogg_static_d.lib vorbis_static.lib theora_static_d.lib libspeex.lib libxml2.lib libxslt.lib iconv.lib pthreadVSE.lib ws2_32.lib winmm.lib ssleay32MT.lib /nologo /subsystem:windows /incremental:no /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcmtd.lib" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 libspeex.lib theora_static_d.lib ogg_static_d.lib vorbis_static_d.lib pthreadVSE.lib ssleay32MT.lib libcurl.lib libxml2.lib libxslt.lib iconv.lib ws2_32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept
+# SUBTRACT LINK32 /verbose
!ENDIF
@@ -110,6 +109,10 @@
# End Source File
# Begin Source File
+SOURCE=\xiph\icecast\branches\kh\icecast\src\main.c
+# End Source File
+# Begin Source File
+
SOURCE=.\StatsTab.cpp
# End Source File
# Begin Source File
Modified: icecast/branches/kh/icecast/win32/Icecast2winDlg.cpp
===================================================================
--- icecast/branches/kh/icecast/win32/Icecast2winDlg.cpp 2008-02-09 11:16:55 UTC (rev 14463)
+++ icecast/branches/kh/icecast/win32/Icecast2winDlg.cpp 2008-02-10 22:20:07 UTC (rev 14464)
@@ -10,6 +10,7 @@
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <stdlib.h>
+#include <curl/curl.h>
extern "C" {
#include "thread.h"
@@ -22,6 +23,7 @@
#include "refbuf.h"
#include "client.h"
#include "stats.h"
+#include "xslt.h"
}
#include <afxinet.h>
@@ -337,6 +339,8 @@
sprintf(version, "Icecast2 Version %s", ICECAST_VERSION);
SetWindowText(version);
+ xslt_initialize();
+ curl_global_init (CURL_GLOBAL_ALL);
if (m_Autostart) {
OnStart();
Modified: icecast/branches/kh/icecast/win32/Makefile.am
===================================================================
--- icecast/branches/kh/icecast/win32/Makefile.am 2008-02-09 11:16:55 UTC (rev 14463)
+++ icecast/branches/kh/icecast/win32/Makefile.am 2008-02-10 22:20:07 UTC (rev 14464)
@@ -12,5 +12,5 @@
colors.h icecast.dsp icecast.ico icecast2.iss icecast2logo2.bmp\
resource.h running.bmp stopped.bmp TRAYNOT.h Traynot.cpp \
icecast2_console.dsw icecast2_console.dsp credits.bmp icecast2title.bmp \
- icecastService.cpp icecastService.dsp config.h.vc6 fnmatch.h
+ icecastService.cpp icecastService.dsp fnmatch.h
Modified: icecast/branches/kh/icecast/win32/icecast.dsp
===================================================================
--- icecast/branches/kh/icecast/win32/icecast.dsp 2008-02-09 11:16:55 UTC (rev 14463)
+++ icecast/branches/kh/icecast/win32/icecast.dsp 2008-02-10 22:20:07 UTC (rev 14464)
@@ -37,11 +37,11 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Releaseicecast"
-# PROP Intermediate_Dir "Releaseicecast"
+# PROP Output_Dir "lib_release"
+# PROP Intermediate_Dir "lib_release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I ".." /I "..\src" /D "NDEBUG" /D "_LIB" /D HAVE_CONFIG_H=1 /D "WIN32" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /Zd /O2 /I ".." /I "..\src" /D "NDEBUG" /D "_LIB" /D HAVE_CONFIG_H=1 /D "WIN32" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -60,11 +60,11 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debugicecast"
-# PROP Intermediate_Dir "Debugicecast"
+# PROP Output_Dir "lib_debug"
+# PROP Intermediate_Dir "lib_debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MT /W3 /Gm /GX /ZI /Od /I ".." /I "..\src" /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D HAVE_CONFIG_H=1 /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ".." /I "..\src" /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D HAVE_CONFIG_H=1 /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -287,10 +287,6 @@
# End Source File
# Begin Source File
-SOURCE=..\src\main.c
-# End Source File
-# Begin Source File
-
SOURCE=..\src\md5.c
# End Source File
# Begin Source File
Modified: icecast/branches/kh/icecast/win32/icecast2.iss
===================================================================
--- icecast/branches/kh/icecast/win32/icecast2.iss 2008-02-09 11:16:55 UTC (rev 14463)
+++ icecast/branches/kh/icecast/win32/icecast2.iss 2008-02-10 22:20:07 UTC (rev 14464)
@@ -3,7 +3,7 @@
[Setup]
AppName=Icecast2-KH
-AppVerName=Icecast v2.3.1-kh29
+AppVerName=Icecast v2.3.1-kh32
AppPublisherURL=http://www.icecast.org
AppSupportURL=http://www.icecast.org
AppUpdatesURL=http://www.icecast.org
@@ -13,7 +13,7 @@
LicenseFile=..\COPYING
InfoAfterFile=..\README
OutputDir=.
-OutputBaseFilename=icecast2_win32_v2.3.1-kh29_setup
+OutputBaseFilename=icecast2_win32_v2.3.1-kh32_setup
WizardImageFile=icecast2logo2.bmp
WizardImageStretch=no
; uncomment the following line if you want your installation to run on NT 3.51 too.
@@ -31,9 +31,9 @@
[Files]
-Source: "Release\Icecast2.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "Release\icecast2console.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "Release\icecastService.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "win_release\icecast2win.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "console_release\icecast2_console.exe"; DestDir: "{app}"; DestName: "icecast2console.exe"; Flags: ignoreversion
+Source: "service_Release\icecastService.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\examples\*"; DestDir: "{app}\examples"; Flags: ignoreversion
Source: "..\doc\*"; DestDir: "{app}\doc"; Flags: ignoreversion
Source: "..\web\*.xsl"; DestDir: "{app}\web"; Flags: ignoreversion
@@ -51,11 +51,12 @@
Source: "c:\xiph\lib\libcurl.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "c:\xiph\lib\libeay32.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "c:\xiph\lib\ssleay32.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "c:\xiph\lib\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion
[Icons]
-Name: "{group}\Icecast2 Win32"; Filename: "{app}\Icecast2.exe";WorkingDir: "{app}";
-Name: "{userdesktop}\Icecast2 Win32"; Filename: "{app}\Icecast2.exe"; MinVersion: 4,4; Tasks: desktopicon;WorkingDir: "{app}";
+Name: "{group}\Icecast2 Win32"; Filename: "{app}\icecast2win.exe";WorkingDir: "{app}";
+Name: "{userdesktop}\Icecast2 Win32"; Filename: "{app}\icecast2win.exe"; MinVersion: 4,4; Tasks: desktopicon;WorkingDir: "{app}";
[Run]
Filename: "{app}\icecastService.exe"; Parameters: "install ""{app}""";Description: "Install Icecast as a windows service.";Flags: postinstall
Modified: icecast/branches/kh/icecast/win32/icecast2_console.dsp
===================================================================
--- icecast/branches/kh/icecast/win32/icecast2_console.dsp 2008-02-09 11:16:55 UTC (rev 14463)
+++ icecast/branches/kh/icecast/win32/icecast2_console.dsp 2008-02-10 22:20:07 UTC (rev 14464)
@@ -37,8 +37,8 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "console_release"
+# PROP Intermediate_Dir "console_release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
@@ -50,7 +50,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 Releaseicecast\icecast.lib theora_static_d.lib libspeex.lib ogg_static_d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libcurl.lib vorbis_static.lib libxml2.lib libxslt.lib iconv.lib pthreadVSE.lib ws2_32.lib ssleay32MT.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /out:"Release/icecast2console.exe"
+# ADD LINK32 theora_static_d.lib libspeex.lib ogg_static_d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libcurl.lib vorbis_static.lib libxml2.lib libxslt.lib iconv.lib pthreadVSE.lib ws2_32.lib ssleay32MT.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmt.lib"
!ELSEIF "$(CFG)" == "icecast2 console - Win32 Debug"
@@ -61,8 +61,8 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "icecast2_console___Win32_Debug"
-# PROP Intermediate_Dir "icecast2_console___Win32_Debug"
+# PROP Output_Dir "console_debug"
+# PROP Intermediate_Dir "console_debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
@@ -74,7 +74,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 Debugicecast\icecast.lib theora_static_d.lib libspeex.lib ogg_static_d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libcurl.lib vorbis_static.lib libxml2.lib libxslt.lib iconv.lib pthreadVSE.lib ws2_32.lib ssleay32MT.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcmtd.lib" /out:"Debug/icecast2console.exe" /pdbtype:sept
+# ADD LINK32 theora_static_d.lib libspeex.lib ogg_static_d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libcurl.lib vorbis_static.lib libxml2.lib libxslt.lib iconv.lib pthreadVSE.lib ws2_32.lib ssleay32MT.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmt.lib" /nodefaultlib:"libcmtd.lib" /pdbtype:sept
!ENDIF
More information about the commits
mailing list