From d9d94aaf6595acb962271ec32c7a9b3734c6c728 Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Fri, 15 Jun 2012 21:45:34 +0200 Subject: [PATCH] First bunch of cleanups --- win32/build-spell.bat | 16 --- win32/build-x64.bat | 46 ------ win32/build-x86.bat | 45 ------ win32/compile-po-files.bat | 10 -- win32/compress.bat | 19 --- win32/deb-extract.bat | 2 - win32/dep-extract-x64.bat | 2 +- win32/dep-extract-x86.bat | 2 +- win32/{deps-x64 => }/deps-x64.txt | 0 win32/{deps-x86 => }/deps-x86.txt | 0 win32/glibconfig-x64.h | 225 ------------------------------ win32/glibconfig-x86.h | 225 ------------------------------ win32/release-x64.bat | 81 ----------- win32/release-x86.bat | 83 ----------- win32/version.c | 143 ------------------- win32/xchat-wdk-spell.skel.iss | 39 ------ 16 files changed, 2 insertions(+), 936 deletions(-) delete mode 100644 win32/build-spell.bat delete mode 100644 win32/build-x64.bat delete mode 100644 win32/build-x86.bat delete mode 100644 win32/compile-po-files.bat delete mode 100644 win32/compress.bat delete mode 100644 win32/deb-extract.bat rename win32/{deps-x64 => }/deps-x64.txt (100%) rename win32/{deps-x86 => }/deps-x86.txt (100%) delete mode 100644 win32/glibconfig-x64.h delete mode 100644 win32/glibconfig-x86.h delete mode 100644 win32/release-x64.bat delete mode 100644 win32/release-x86.bat delete mode 100644 win32/version.c delete mode 100644 win32/xchat-wdk-spell.skel.iss diff --git a/win32/build-spell.bat b/win32/build-spell.bat deleted file mode 100644 index 7325e426..00000000 --- a/win32/build-spell.bat +++ /dev/null @@ -1,16 +0,0 @@ -@echo off -set DEPS_ROOT=deps-x86 -set XCHAT_DEST=tmp-spell -rmdir /q /s %XCHAT_DEST% -mkdir %XCHAT_DEST% -xcopy /q /s /i %DEPS_ROOT%\myspell %XCHAT_DEST%\share\myspell -copy ..\COPYING %XCHAT_DEST% -echo [Setup] > xchat-wdk-spell.iss -echo WizardImageFile=%cd%\bitmaps\wizardimage.bmp >> xchat-wdk-spell.iss -echo WizardSmallImageFile=%cd%\bitmaps\wizardsmallimage.bmp >> xchat-wdk-spell.iss -cd .. -echo SetupIconFile=%cd%\xchat.ico >> build\xchat-wdk-spell.iss -type build\xchat-wdk-spell.skel.iss >> build\xchat-wdk-spell.iss -set PATH=%PROGRAMFILES(X86)%\Inno Setup 5 -compil32 /cc build\xchat-wdk-spell.iss -pause diff --git a/win32/build-x64.bat b/win32/build-x64.bat deleted file mode 100644 index 6b5b9d99..00000000 --- a/win32/build-x64.bat +++ /dev/null @@ -1,46 +0,0 @@ -@echo off -set WDK_ROOT=c:\WinDDK\7600.16385.1 -set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70;%WDK_ROOT%\inc\mfc42;%WDK_ROOT%\inc\ddk;%WDK_ROOT%\inc\api\dao360 -set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64;%WDK_ROOT%\lib\Mfc\amd64;%WDK_ROOT%\lib\ATL\amd64 -set OPATH=%PATH% -set DEV_64=%cd%\deps-x64 -set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;%DEV_64%\bin;c:\mozilla-build\gendef -set PERL_512=c:\mozilla-build\perl-5.12-x64\perl -set PERL_514=c:\mozilla-build\perl-5.14-x64\perl -echo [Setup] > xchat-wdk-x64.iss -echo WizardImageFile=%cd%\bitmaps\wizardimage.bmp >> xchat-wdk-x64.iss -echo WizardSmallImageFile=%cd%\bitmaps\wizardsmallimage.bmp >> xchat-wdk-x64.iss -del version.exe -cl /nologo version.c -version -a64 >> xchat-wdk-x64.iss -version -v >> xchat-wdk-x64.iss -version -i >> xchat-wdk-x64.iss -version -o64 >> xchat-wdk-x64.iss -cd .. -win32\version -r > resource.h -echo SetupIconFile=%cd%\xchat.ico >> win32\xchat-wdk-x64.iss -type win32\xchat-wdk-x64.skel.iss >> win32\xchat-wdk-x64.iss -cd src -echo DEV = %DEV_64% > makeinc.mak -echo X64 = YES >> makeinc.mak -type makeinc.skel.mak >> makeinc.mak -nmake /nologo /f makefile.mak clean -nmake /nologo /f makefile.mak -cd ..\plugins -nmake /nologo /f makefile.mak clean -nmake /nologo /f makefile.mak -cd perl -set OOPATH=%PATH% -set PATH=%OOPATH%;%PERL_512%\bin -nmake /nologo /s /f makefile-512.mak clean -nmake /nologo /s /f makefile-512.mak -set PATH=%OOPATH%;%PERL_514%\bin -nmake /nologo /s /f makefile-514.mak clean -nmake /nologo /s /f makefile-514.mak -cd ..\..\win32 -call compile-po-files.bat -set PATH=%OPATH% -call release-x64.bat -set PATH=%PROGRAMFILES(X86)%\Inno Setup 5 -compil32 /cc xchat-wdk-x64.iss -pause diff --git a/win32/build-x86.bat b/win32/build-x86.bat deleted file mode 100644 index 85c7c2d1..00000000 --- a/win32/build-x86.bat +++ /dev/null @@ -1,45 +0,0 @@ -@echo off -set WDK_ROOT=c:\WinDDK\7600.16385.1 -set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70;%WDK_ROOT%\inc\mfc42;%WDK_ROOT%\inc\ddk;%WDK_ROOT%\inc\api\dao360 -set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386;%WDK_ROOT%\lib\Mfc\i386;%WDK_ROOT%\lib\ATL\i386 -set OPATH=%PATH% -set DEV_32=%cd%\deps-x86 -set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;%DEV_32%\bin;c:\mozilla-build\gendef -set PERL_512=c:\mozilla-build\perl-5.12-x86\perl -set PERL_514=c:\mozilla-build\perl-5.14-x86\perl -echo [Setup] > xchat-wdk-x86.iss -echo WizardImageFile=%cd%\bitmaps\wizardimage.bmp >> xchat-wdk-x86.iss -echo WizardSmallImageFile=%cd%\bitmaps\wizardsmallimage.bmp >> xchat-wdk-x86.iss -del version.exe -cl /nologo version.c -version -a32 >> xchat-wdk-x86.iss -version -v >> xchat-wdk-x86.iss -version -i >> xchat-wdk-x86.iss -version -o32 >> xchat-wdk-x86.iss -cd .. -win32\version -r > resource.h -echo SetupIconFile=%cd%\xchat.ico >> win32\xchat-wdk-x86.iss -type win32\xchat-wdk-x86.skel.iss >> win32\xchat-wdk-x86.iss -cd src -echo DEV = %DEV_32% > makeinc.mak -type makeinc.skel.mak >> makeinc.mak -nmake /nologo /f makefile.mak clean -nmake /nologo /f makefile.mak -cd ..\plugins -nmake /nologo /f makefile.mak clean -nmake /nologo /f makefile.mak -cd perl -set OOPATH=%PATH% -set PATH=%OOPATH%;%PERL_512%\bin -nmake /nologo /s /f makefile-512.mak clean -nmake /nologo /s /f makefile-512.mak -set PATH=%OOPATH%;%PERL_514%\bin -nmake /nologo /s /f makefile-514.mak clean -nmake /nologo /s /f makefile-514.mak -cd ..\..\win32 -call compile-po-files.bat -set PATH=%OPATH% -call release-x86.bat -set PATH=%PROGRAMFILES(X86)%\Inno Setup 5 -compil32 /cc xchat-wdk-x86.iss -pause diff --git a/win32/compile-po-files.bat b/win32/compile-po-files.bat deleted file mode 100644 index 6ffde997..00000000 --- a/win32/compile-po-files.bat +++ /dev/null @@ -1,10 +0,0 @@ -@echo off -echo.Compiling translations . . . -cd ..\po -rmdir /q /s locale -mkdir locale -for %%A in (*.po) do ( - mkdir locale\%%~nA\LC_MESSAGES - msgfmt -co locale\%%~nA\LC_MESSAGES\xchat.mo %%A -) -cd ..\win32 diff --git a/win32/compress.bat b/win32/compress.bat deleted file mode 100644 index 37df1292..00000000 --- a/win32/compress.bat +++ /dev/null @@ -1,19 +0,0 @@ -@echo off -set OPATH=%PATH% -set PATH=c:\mozilla-build\mpress;c:\mozilla-build\upx -cd ..\tmp -for %%A in (*.dll) do upx -9 -q %%A -for %%A in (*.x64) do mpress -q %%A -upx xchat.exe -cd lib\enchant -for %%A in (*.dll) do upx -9 -q %%A -for %%A in (*.x64) do mpress -q %%A -:: gtk-2.0\2.10.0\engines is already packed, skip it -cd ..\gtk-2.0\modules -for %%A in (*.dll) do upx -9 -q %%A -for %%A in (*.x64) do mpress -q %%A -cd ..\..\..\plugins -for %%A in (*.dll) do upx -9 -q %%A -for %%A in (*.x64) do mpress -q %%A -cd ..\..\build -set PATH=%OPATH% diff --git a/win32/deb-extract.bat b/win32/deb-extract.bat deleted file mode 100644 index 913397b9..00000000 --- a/win32/deb-extract.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -for %%A in (*.deb) do 7z x %%A && 7z x data.tar && del data.tar diff --git a/win32/dep-extract-x64.bat b/win32/dep-extract-x64.bat index ee958c9b..133c599d 100644 --- a/win32/dep-extract-x64.bat +++ b/win32/dep-extract-x64.bat @@ -1,7 +1,7 @@ @echo off set PATH=%PATH%;%PROGRAMW6432%\7-Zip;c:\mozilla-build\gendef -cd deps-x64 +cd x64 ::obs 7z x -y *.rpm ::obs 7z x *.cpio ::obs del *.cpio diff --git a/win32/dep-extract-x86.bat b/win32/dep-extract-x86.bat index a774f7ed..db087587 100644 --- a/win32/dep-extract-x86.bat +++ b/win32/dep-extract-x86.bat @@ -1,7 +1,7 @@ @echo off set PATH=%PATH%;%PROGRAMW6432%\7-Zip;c:\mozilla-build\gendef -cd deps-x86 +cd Win32 ::obs 7z x -y *.rpm ::obs 7z x *.cpio ::obs del *.cpio diff --git a/win32/deps-x64/deps-x64.txt b/win32/deps-x64.txt similarity index 100% rename from win32/deps-x64/deps-x64.txt rename to win32/deps-x64.txt diff --git a/win32/deps-x86/deps-x86.txt b/win32/deps-x86.txt similarity index 100% rename from win32/deps-x86/deps-x86.txt rename to win32/deps-x86.txt diff --git a/win32/glibconfig-x64.h b/win32/glibconfig-x64.h deleted file mode 100644 index 84a6e22b..00000000 --- a/win32/glibconfig-x64.h +++ /dev/null @@ -1,225 +0,0 @@ -/* glibconfig.h - * - * This is a generated file. Please modify 'configure.ac' - */ - -#ifndef __G_LIBCONFIG_H__ -#define __G_LIBCONFIG_H__ - -#include - -#include -#include - -G_BEGIN_DECLS - -#define G_MINFLOAT FLT_MIN -#define G_MAXFLOAT FLT_MAX -#define G_MINDOUBLE DBL_MIN -#define G_MAXDOUBLE DBL_MAX -#define G_MINSHORT SHRT_MIN -#define G_MAXSHORT SHRT_MAX -#define G_MAXUSHORT USHRT_MAX -#define G_MININT INT_MIN -#define G_MAXINT INT_MAX -#define G_MAXUINT UINT_MAX -#define G_MINLONG LONG_MIN -#define G_MAXLONG LONG_MAX -#define G_MAXULONG ULONG_MAX - -typedef signed char gint8; -typedef unsigned char guint8; -typedef signed short gint16; -typedef unsigned short guint16; -#define G_GINT16_MODIFIER "h" -#define G_GINT16_FORMAT "hi" -#define G_GUINT16_FORMAT "hu" -typedef signed int gint32; -typedef unsigned int guint32; -#define G_GINT32_MODIFIER "" -#define G_GINT32_FORMAT "i" -#define G_GUINT32_FORMAT "u" -#define G_HAVE_GINT64 1 /* deprecated, always true */ - -G_GNUC_EXTENSION typedef signed long long gint64; -G_GNUC_EXTENSION typedef unsigned long long guint64; - -#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL)) -#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL)) -#define G_GINT64_MODIFIER "I64" -#define G_GINT64_FORMAT "I64i" -#define G_GUINT64_FORMAT "I64u" - -#define GLIB_SIZEOF_VOID_P 8 -#define GLIB_SIZEOF_LONG 4 -#define GLIB_SIZEOF_SIZE_T 8 - -typedef signed long long gssize; -typedef unsigned long long gsize; -#define G_GSIZE_MODIFIER "I64" -#define G_GSSIZE_FORMAT "I64i" -#define G_GSIZE_FORMAT "I64u" - -#define G_MAXSIZE G_MAXUINT64 -#define G_MINSSIZE G_MININT64 -#define G_MAXSSIZE G_MAXINT64 - -typedef gint64 goffset; -#define G_MINOFFSET G_MININT64 -#define G_MAXOFFSET G_MAXINT64 - -#define G_GOFFSET_MODIFIER G_GINT64_MODIFIER -#define G_GOFFSET_FORMAT G_GINT64_FORMAT -#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val) - - -#define GPOINTER_TO_INT(p) ((gint) (gint64) (p)) -#define GPOINTER_TO_UINT(p) ((guint) (guint64) (p)) - -#define GINT_TO_POINTER(i) ((gpointer) (gint64) (i)) -#define GUINT_TO_POINTER(u) ((gpointer) (guint64) (u)) - -typedef signed long long gintptr; -typedef unsigned long long guintptr; - -#define G_GINTPTR_MODIFIER "I64" -#define G_GINTPTR_FORMAT "I64i" -#define G_GUINTPTR_FORMAT "I64u" - -#ifdef NeXT /* @#%@! NeXTStep */ -# define g_ATEXIT(proc) (!atexit (proc)) -#else -# define g_ATEXIT(proc) (atexit (proc)) -#endif - -#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END - -#define GLIB_MAJOR_VERSION 2 -#define GLIB_MINOR_VERSION 30 -#define GLIB_MICRO_VERSION 2 - -#define G_OS_WIN32 -#define G_PLATFORM_WIN32 - - -#define G_VA_COPY va_copy - -#ifdef __cplusplus -#define G_HAVE_INLINE 1 -#else /* !__cplusplus */ -#ifndef _MSC_VER -#define G_HAVE_INLINE 1 -#endif /* _MSC_VER */ -#define G_HAVE___INLINE 1 -#if !defined(_MSC_VER) && !defined(__DMC__) -#define G_HAVE___INLINE__ 1 -#endif /* !_MSC_VER and !__DMC__ */ -#endif /* !__cplusplus */ - -#ifdef __cplusplus -#define G_CAN_INLINE 1 -#else /* !__cplusplus */ -#define G_CAN_INLINE 1 -#endif - -#ifndef __cplusplus -# define G_HAVE_ISO_VARARGS 1 -#endif - -/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi - * is passed ISO vararg support is turned off, and there is no work - * around to turn it on, so we unconditionally turn it off. - */ -#if __GNUC__ == 2 && __GNUC_MINOR__ == 95 -# undef G_HAVE_ISO_VARARGS -#endif - -#define G_HAVE_GNUC_VARARGS 1 -#define G_HAVE_GROWING_STACK 0 - -#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) -#define G_GNUC_INTERNAL __attribute__((visibility("hidden"))) -#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) -#define G_GNUC_INTERNAL __hidden -#elif defined (__GNUC__) && defined (G_HAVE_GNUC_VISIBILITY) -#define G_GNUC_INTERNAL __attribute__((visibility("hidden"))) -#else -#define G_GNUC_INTERNAL -#endif - -#define G_THREADS_ENABLED -#define G_THREADS_IMPL_WIN32 -typedef struct _GMutex* GStaticMutex; -#define G_STATIC_MUTEX_INIT NULL -#define g_static_mutex_get_mutex(mutex) \ - (g_static_mutex_get_mutex_impl_shortcut (mutex)) -/* This represents a system thread as used by the implementation. An - * alien implementaion, as loaded by g_thread_init can only count on - * "sizeof (gpointer)" bytes to store their info. We however need more - * for some of our native implementations. */ -typedef union _GSystemThread GSystemThread; -union _GSystemThread -{ - char data[8]; - double dummy_double; - void *dummy_pointer; - long dummy_long; -}; - -#define G_ATOMIC_OP_USE_GCC_BUILTINS 1 - -#define GINT16_TO_LE(val) ((gint16) (val)) -#define GUINT16_TO_LE(val) ((guint16) (val)) -#define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val)) -#define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val)) -#define GINT32_TO_LE(val) ((gint32) (val)) -#define GUINT32_TO_LE(val) ((guint32) (val)) -#define GINT32_TO_BE(val) ((gint32) GUINT32_SWAP_LE_BE (val)) -#define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE (val)) -#define GINT64_TO_LE(val) ((gint64) (val)) -#define GUINT64_TO_LE(val) ((guint64) (val)) -#define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val)) -#define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val)) -#define GLONG_TO_LE(val) ((glong) GINT32_TO_LE (val)) -#define GULONG_TO_LE(val) ((gulong) GUINT32_TO_LE (val)) -#define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val)) -#define GULONG_TO_BE(val) ((gulong) GUINT32_TO_BE (val)) -#define GINT_TO_LE(val) ((gint) GINT32_TO_LE (val)) -#define GUINT_TO_LE(val) ((guint) GUINT32_TO_LE (val)) -#define GINT_TO_BE(val) ((gint) GINT32_TO_BE (val)) -#define GUINT_TO_BE(val) ((guint) GUINT32_TO_BE (val)) -#define GSIZE_TO_LE(val) ((gsize) GUINT64_TO_LE (val)) -#define GSSIZE_TO_LE(val) ((gssize) GINT64_TO_LE (val)) -#define GSIZE_TO_BE(val) ((gsize) GUINT64_TO_BE (val)) -#define GSSIZE_TO_BE(val) ((gssize) GINT64_TO_BE (val)) -#define G_BYTE_ORDER G_LITTLE_ENDIAN - -#define GLIB_SYSDEF_POLLIN =1 -#define GLIB_SYSDEF_POLLOUT =4 -#define GLIB_SYSDEF_POLLPRI =2 -#define GLIB_SYSDEF_POLLHUP =16 -#define GLIB_SYSDEF_POLLERR =8 -#define GLIB_SYSDEF_POLLNVAL =32 - -#define G_MODULE_SUFFIX "dll" - -/* A GPid is an abstraction for a process "handle". It is *not* an - * abstraction for a process identifier in general. GPid is used in - * GLib only for descendant processes spawned with the g_spawn* - * functions. On POSIX there is no "process handle" concept as such, - * but on Windows a GPid is a handle to a process, a kind of pointer, - * not a process identifier. - */ -typedef void * GPid; - -#define GLIB_SYSDEF_AF_UNIX 1 -#define GLIB_SYSDEF_AF_INET 2 -#define GLIB_SYSDEF_AF_INET6 23 - -#define GLIB_SYSDEF_MSG_OOB 1 -#define GLIB_SYSDEF_MSG_PEEK 2 -#define GLIB_SYSDEF_MSG_DONTROUTE 4 - -G_END_DECLS - -#endif /* GLIBCONFIG_H */ diff --git a/win32/glibconfig-x86.h b/win32/glibconfig-x86.h deleted file mode 100644 index 7f8a0636..00000000 --- a/win32/glibconfig-x86.h +++ /dev/null @@ -1,225 +0,0 @@ -/* glibconfig.h - * - * This is a generated file. Please modify 'configure.ac' - */ - -#ifndef __G_LIBCONFIG_H__ -#define __G_LIBCONFIG_H__ - -#include - -#include -#include - -G_BEGIN_DECLS - -#define G_MINFLOAT FLT_MIN -#define G_MAXFLOAT FLT_MAX -#define G_MINDOUBLE DBL_MIN -#define G_MAXDOUBLE DBL_MAX -#define G_MINSHORT SHRT_MIN -#define G_MAXSHORT SHRT_MAX -#define G_MAXUSHORT USHRT_MAX -#define G_MININT INT_MIN -#define G_MAXINT INT_MAX -#define G_MAXUINT UINT_MAX -#define G_MINLONG LONG_MIN -#define G_MAXLONG LONG_MAX -#define G_MAXULONG ULONG_MAX - -typedef signed char gint8; -typedef unsigned char guint8; -typedef signed short gint16; -typedef unsigned short guint16; -#define G_GINT16_MODIFIER "h" -#define G_GINT16_FORMAT "hi" -#define G_GUINT16_FORMAT "hu" -typedef signed int gint32; -typedef unsigned int guint32; -#define G_GINT32_MODIFIER "" -#define G_GINT32_FORMAT "i" -#define G_GUINT32_FORMAT "u" -#define G_HAVE_GINT64 1 /* deprecated, always true */ - -G_GNUC_EXTENSION typedef signed long long gint64; -G_GNUC_EXTENSION typedef unsigned long long guint64; - -#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL)) -#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL)) -#define G_GINT64_MODIFIER "I64" -#define G_GINT64_FORMAT "I64i" -#define G_GUINT64_FORMAT "I64u" - -#define GLIB_SIZEOF_VOID_P 4 -#define GLIB_SIZEOF_LONG 4 -#define GLIB_SIZEOF_SIZE_T 4 - -typedef signed int gssize; -typedef unsigned int gsize; -#define G_GSIZE_MODIFIER "" -#define G_GSSIZE_FORMAT "i" -#define G_GSIZE_FORMAT "u" - -#define G_MAXSIZE G_MAXUINT -#define G_MINSSIZE G_MININT -#define G_MAXSSIZE G_MAXINT - -typedef gint64 goffset; -#define G_MINOFFSET G_MININT64 -#define G_MAXOFFSET G_MAXINT64 - -#define G_GOFFSET_MODIFIER G_GINT64_MODIFIER -#define G_GOFFSET_FORMAT G_GINT64_FORMAT -#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val) - - -#define GPOINTER_TO_INT(p) ((gint) (p)) -#define GPOINTER_TO_UINT(p) ((guint) (p)) - -#define GINT_TO_POINTER(i) ((gpointer) (i)) -#define GUINT_TO_POINTER(u) ((gpointer) (u)) - -typedef signed int gintptr; -typedef unsigned int guintptr; - -#define G_GINTPTR_MODIFIER "" -#define G_GINTPTR_FORMAT "i" -#define G_GUINTPTR_FORMAT "u" - -#ifdef NeXT /* @#%@! NeXTStep */ -# define g_ATEXIT(proc) (!atexit (proc)) -#else -# define g_ATEXIT(proc) (atexit (proc)) -#endif - -#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END - -#define GLIB_MAJOR_VERSION 2 -#define GLIB_MINOR_VERSION 30 -#define GLIB_MICRO_VERSION 2 - -#define G_OS_WIN32 -#define G_PLATFORM_WIN32 - - -#define G_VA_COPY va_copy - -#ifdef __cplusplus -#define G_HAVE_INLINE 1 -#else /* !__cplusplus */ -#ifndef _MSC_VER -#define G_HAVE_INLINE 1 -#endif /* _MSC_VER */ -#define G_HAVE___INLINE 1 -#if !defined(_MSC_VER) && !defined(__DMC__) -#define G_HAVE___INLINE__ 1 -#endif /* !_MSC_VER and !__DMC__ */ -#endif /* !__cplusplus */ - -#ifdef __cplusplus -#define G_CAN_INLINE 1 -#else /* !__cplusplus */ -#define G_CAN_INLINE 1 -#endif - -#ifndef __cplusplus -# define G_HAVE_ISO_VARARGS 1 -#endif - -/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi - * is passed ISO vararg support is turned off, and there is no work - * around to turn it on, so we unconditionally turn it off. - */ -#if __GNUC__ == 2 && __GNUC_MINOR__ == 95 -# undef G_HAVE_ISO_VARARGS -#endif - -#define G_HAVE_GNUC_VARARGS 1 -#define G_HAVE_GROWING_STACK 0 - -#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) -#define G_GNUC_INTERNAL __attribute__((visibility("hidden"))) -#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) -#define G_GNUC_INTERNAL __hidden -#elif defined (__GNUC__) && defined (G_HAVE_GNUC_VISIBILITY) -#define G_GNUC_INTERNAL __attribute__((visibility("hidden"))) -#else -#define G_GNUC_INTERNAL -#endif - -#define G_THREADS_ENABLED -#define G_THREADS_IMPL_WIN32 -typedef struct _GMutex* GStaticMutex; -#define G_STATIC_MUTEX_INIT NULL -#define g_static_mutex_get_mutex(mutex) \ - (g_static_mutex_get_mutex_impl_shortcut (mutex)) -/* This represents a system thread as used by the implementation. An - * alien implementaion, as loaded by g_thread_init can only count on - * "sizeof (gpointer)" bytes to store their info. We however need more - * for some of our native implementations. */ -typedef union _GSystemThread GSystemThread; -union _GSystemThread -{ - char data[4]; - double dummy_double; - void *dummy_pointer; - long dummy_long; -}; - -#define G_ATOMIC_OP_USE_GCC_BUILTINS 1 - -#define GINT16_TO_LE(val) ((gint16) (val)) -#define GUINT16_TO_LE(val) ((guint16) (val)) -#define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val)) -#define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val)) -#define GINT32_TO_LE(val) ((gint32) (val)) -#define GUINT32_TO_LE(val) ((guint32) (val)) -#define GINT32_TO_BE(val) ((gint32) GUINT32_SWAP_LE_BE (val)) -#define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE (val)) -#define GINT64_TO_LE(val) ((gint64) (val)) -#define GUINT64_TO_LE(val) ((guint64) (val)) -#define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val)) -#define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val)) -#define GLONG_TO_LE(val) ((glong) GINT32_TO_LE (val)) -#define GULONG_TO_LE(val) ((gulong) GUINT32_TO_LE (val)) -#define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val)) -#define GULONG_TO_BE(val) ((gulong) GUINT32_TO_BE (val)) -#define GINT_TO_LE(val) ((gint) GINT32_TO_LE (val)) -#define GUINT_TO_LE(val) ((guint) GUINT32_TO_LE (val)) -#define GINT_TO_BE(val) ((gint) GINT32_TO_BE (val)) -#define GUINT_TO_BE(val) ((guint) GUINT32_TO_BE (val)) -#define GSIZE_TO_LE(val) ((gsize) GUINT32_TO_LE (val)) -#define GSSIZE_TO_LE(val) ((gssize) GINT32_TO_LE (val)) -#define GSIZE_TO_BE(val) ((gsize) GUINT32_TO_BE (val)) -#define GSSIZE_TO_BE(val) ((gssize) GINT32_TO_BE (val)) -#define G_BYTE_ORDER G_LITTLE_ENDIAN - -#define GLIB_SYSDEF_POLLIN =1 -#define GLIB_SYSDEF_POLLOUT =4 -#define GLIB_SYSDEF_POLLPRI =2 -#define GLIB_SYSDEF_POLLHUP =16 -#define GLIB_SYSDEF_POLLERR =8 -#define GLIB_SYSDEF_POLLNVAL =32 - -#define G_MODULE_SUFFIX "dll" - -/* A GPid is an abstraction for a process "handle". It is *not* an - * abstraction for a process identifier in general. GPid is used in - * GLib only for descendant processes spawned with the g_spawn* - * functions. On POSIX there is no "process handle" concept as such, - * but on Windows a GPid is a handle to a process, a kind of pointer, - * not a process identifier. - */ -typedef void * GPid; - -#define GLIB_SYSDEF_AF_UNIX 1 -#define GLIB_SYSDEF_AF_INET 2 -#define GLIB_SYSDEF_AF_INET6 23 - -#define GLIB_SYSDEF_MSG_OOB 1 -#define GLIB_SYSDEF_MSG_PEEK 2 -#define GLIB_SYSDEF_MSG_DONTROUTE 4 - -G_END_DECLS - -#endif /* GLIBCONFIG_H */ diff --git a/win32/release-x64.bat b/win32/release-x64.bat deleted file mode 100644 index 8437f525..00000000 --- a/win32/release-x64.bat +++ /dev/null @@ -1,81 +0,0 @@ -@echo off -set DEPS_ROOT=deps-x64 -set XCHAT_DEST=dist-x64 -rmdir /q /s %XCHAT_DEST% -mkdir %XCHAT_DEST% -echo 2> portable-mode -move portable-mode %XCHAT_DEST% -copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST% -copy ..\src\fe-text\xchat-text.exe %XCHAT_DEST% -::obs copy ..\src\gtk2-prefs\gtk2-prefs.exe %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST% -::obs copy %DEPS_ROOT%\bin\libffi-5.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libfontconfig-1.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libfreetype-6.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libgdk-win32-2.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libgio-2.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libglib-2.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libgmodule-2.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libgobject-2.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libgthread-2.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libintl-8.dll %XCHAT_DEST% -::obs copy %DEPS_ROOT%\bin\libjasper-1.dll %XCHAT_DEST% -::obs copy %DEPS_ROOT%\bin\libjpeg-8.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libpango-1.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libpangocairo-1.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libpangoft2-1.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libpangowin32-1.0-0.dll %XCHAT_DEST% -::obs copy %DEPS_ROOT%\bin\libpixman-1-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libpng14-14.dll %XCHAT_DEST% -::obs copy %DEPS_ROOT%\bin\libpng15-15.dll %XCHAT_DEST% -::obs copy %DEPS_ROOT%\bin\libtiff-3.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libxml2.dll %XCHAT_DEST% -::obs copy %DEPS_ROOT%\bin\libxml2-2.dll %XCHAT_DEST% -xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines -xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\ -xcopy /q /s /i etc %XCHAT_DEST%\etc -xcopy /q /s /i share %XCHAT_DEST%\share -::obs xcopy /q /s /i %DEPS_ROOT%\share\themes %XCHAT_DEST%\share\themes -copy ..\COPYING %XCHAT_DEST% -copy %DEPS_ROOT%\LICENSE.OPENSSL %XCHAT_DEST% -copy %DEPS_ROOT%\LICENSE.ZLIB %XCHAT_DEST% -copy %DEPS_ROOT%\share\gettext\intl\COPYING.LIB-2.0 %XCHAT_DEST%\LICENSE.GTK -copy %DEPS_ROOT%\share\gettext\intl\COPYING.LIB-2.1 %XCHAT_DEST%\LICENSE.CAIRO -copy %DEPS_ROOT%\LICENSE.LUA %XCHAT_DEST% -copy %DEPS_ROOT%\LICENSE.ENCHANT %XCHAT_DEST% -copy %DEPS_ROOT%\LICENSE.LIBXML %XCHAT_DEST% -::obs copy %DEPS_ROOT%\share\doc\libxml2-2.7.8\Copyright %XCHAT_DEST%\LICENSE.LIBXML -copy %DEPS_ROOT%\bin\libeay32.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\ssleay32.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\zlib1.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\cert.pem %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libenchant.dll %XCHAT_DEST% -xcopy /q /s /i %DEPS_ROOT%\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\ -xcopy /q /s /i ..\plugins\checksum\xcchecksum.dll %XCHAT_DEST%\plugins\ -copy ..\plugins\dns\xcdns.dll %XCHAT_DEST%\plugins -copy ..\plugins\doat\xcdoat.dll %XCHAT_DEST%\plugins -copy ..\plugins\exec\xcexec.dll %XCHAT_DEST%\plugins -copy ..\plugins\fishlim\xcfishlim.dll %XCHAT_DEST%\plugins -copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins -::obs copy ..\plugins\gtkpref\xcgtkpref.dll %XCHAT_DEST%\plugins -copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins -::copy ..\plugins\nonbmp\xcnonbmp.dll %XCHAT_DEST%\plugins -copy ..\plugins\perl\xcperl-512.dll %XCHAT_DEST%\plugins -copy ..\plugins\perl\xcperl-514.dll %XCHAT_DEST%\plugins -copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins -copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins -copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins -copy ..\plugins\xsasl\xcxsasl.dll %XCHAT_DEST%\plugins -copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins -copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins -copy ..\plugins\winsys\xcwinsys.dll %XCHAT_DEST%\plugins -copy ..\plugins\wmpa\xcwmpa.dll %XCHAT_DEST%\plugins -copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST% -xcopy /q /s /i ..\po\locale %XCHAT_DEST%\locale -xcopy /q /s /i %DEPS_ROOT%\share\locale %XCHAT_DEST%\share\locale -copy "%PROGRAMFILES(X86)%\Codejock Software\ISSkin\ISSkinU.dll" %XCHAT_DEST% -copy isskin\watercolorlite-blue.cjstyles %XCHAT_DEST% diff --git a/win32/release-x86.bat b/win32/release-x86.bat deleted file mode 100644 index dc022b75..00000000 --- a/win32/release-x86.bat +++ /dev/null @@ -1,83 +0,0 @@ -@echo off -set DEPS_ROOT=deps-x86 -set XCHAT_DEST=dist-x86 -rmdir /q /s %XCHAT_DEST% -mkdir %XCHAT_DEST% -echo 2> portable-mode -move portable-mode %XCHAT_DEST% -copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST% -copy ..\src\fe-text\xchat-text.exe %XCHAT_DEST% -::obs copy ..\src\gtk2-prefs\gtk2-prefs.exe %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST% -::obs copy %DEPS_ROOT%\bin\libffi-5.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libfontconfig-1.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\freetype6.dll %XCHAT_DEST% -::obs copy %DEPS_ROOT%\bin\libfreetype-6.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libgdk-win32-2.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libgio-2.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libglib-2.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libgmodule-2.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libgobject-2.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libgthread-2.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\intl.dll %XCHAT_DEST% -::obs copy %DEPS_ROOT%\bin\libintl-8.dll %XCHAT_DEST% -::obs copy %DEPS_ROOT%\bin\libjasper-1.dll %XCHAT_DEST% -::obs copy %DEPS_ROOT%\bin\libjpeg-8.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libpango-1.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libpangocairo-1.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libpangoft2-1.0-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libpangowin32-1.0-0.dll %XCHAT_DEST% -::obs copy %DEPS_ROOT%\bin\libpixman-1-0.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libpng14-14.dll %XCHAT_DEST% -::obs copy %DEPS_ROOT%\bin\libpng15-15.dll %XCHAT_DEST% -::obs copy %DEPS_ROOT%\bin\libtiff-3.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libxml2.dll %XCHAT_DEST% -::obs copy %DEPS_ROOT%\bin\libxml2-2.dll %XCHAT_DEST% -xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines -xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\ -xcopy /q /s /i etc %XCHAT_DEST%\etc -xcopy /q /s /i share %XCHAT_DEST%\share -::obs xcopy /q /s /i %DEPS_ROOT%\share\themes %XCHAT_DEST%\share\themes -copy ..\COPYING %XCHAT_DEST% -copy %DEPS_ROOT%\LICENSE.OPENSSL %XCHAT_DEST% -copy %DEPS_ROOT%\LICENSE.ZLIB %XCHAT_DEST% -copy %DEPS_ROOT%\share\gettext\intl\COPYING.LIB-2.0 %XCHAT_DEST%\LICENSE.GTK -copy %DEPS_ROOT%\share\gettext\intl\COPYING.LIB-2.1 %XCHAT_DEST%\LICENSE.CAIRO -copy %DEPS_ROOT%\LICENSE.LUA %XCHAT_DEST% -copy %DEPS_ROOT%\LICENSE.ENCHANT %XCHAT_DEST% -copy %DEPS_ROOT%\LICENSE.LIBXML %XCHAT_DEST% -::obs copy %DEPS_ROOT%\share\doc\libxml2-2.7.8\Copyright %XCHAT_DEST%\LICENSE.LIBXML -copy %DEPS_ROOT%\bin\libeay32.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\ssleay32.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\zlib1.dll %XCHAT_DEST% -copy %DEPS_ROOT%\bin\cert.pem %XCHAT_DEST% -copy %DEPS_ROOT%\bin\libenchant.dll %XCHAT_DEST% -xcopy /q /s /i %DEPS_ROOT%\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\ -xcopy /q /s /i ..\plugins\checksum\xcchecksum.dll %XCHAT_DEST%\plugins\ -copy ..\plugins\dns\xcdns.dll %XCHAT_DEST%\plugins -copy ..\plugins\doat\xcdoat.dll %XCHAT_DEST%\plugins -copy ..\plugins\exec\xcexec.dll %XCHAT_DEST%\plugins -copy ..\plugins\fishlim\xcfishlim.dll %XCHAT_DEST%\plugins -copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins -::obs copy ..\plugins\gtkpref\xcgtkpref.dll %XCHAT_DEST%\plugins -copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins -::copy ..\plugins\nonbmp\xcnonbmp.dll %XCHAT_DEST%\plugins -copy ..\plugins\perl\xcperl-512.dll %XCHAT_DEST%\plugins -copy ..\plugins\perl\xcperl-514.dll %XCHAT_DEST%\plugins -copy ..\plugins\python\xcpython.dll %XCHAT_DEST%\plugins -copy ..\plugins\tcl\xctcl.dll %XCHAT_DEST%\plugins -copy ..\plugins\upd\xcupd.dll %XCHAT_DEST%\plugins -copy ..\plugins\xsasl\xcxsasl.dll %XCHAT_DEST%\plugins -copy ..\plugins\xtray\xtray.dll %XCHAT_DEST%\plugins -copy ..\plugins\winamp\xcwinamp.dll %XCHAT_DEST%\plugins -copy ..\plugins\winsys\xcwinsys.dll %XCHAT_DEST%\plugins -copy ..\plugins\wmpa\xcwmpa.dll %XCHAT_DEST%\plugins -copy %DEPS_ROOT%\bin\lua51.dll %XCHAT_DEST% -xcopy /q /s /i ..\po\locale %XCHAT_DEST%\locale -xcopy /q /s /i %DEPS_ROOT%\share\locale %XCHAT_DEST%\share\locale -copy "%PROGRAMFILES(X86)%\Codejock Software\ISSkin\ISSkinU.dll" %XCHAT_DEST% -copy isskin\watercolorlite-green.cjstyles %XCHAT_DEST% diff --git a/win32/version.c b/win32/version.c deleted file mode 100644 index 0201d298..00000000 --- a/win32/version.c +++ /dev/null @@ -1,143 +0,0 @@ -/* XChat-WDK - * Copyright (c) 2011 Berke Viktor. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include "../config.h" - -char * -comma () -{ - int major, minor; - char *version_string; /* nnnn,n,n,n format */ - - version_string = (char*) malloc (11); - - if (sscanf (PACKAGE_VERSION, "%d-%d", &major, &minor) > 1) - { - sprintf (version_string, "%d,%d,0,0", major, minor); - } else - { - sprintf (version_string, "%d,0,0,0", major); - } - - return version_string; -} - -char * -point () -{ - int major1, major2, major3, major4, minor; - char *version_string; /* nn.nn.nn.nn format */ - - version_string = (char*) malloc (12); - - if (sscanf (PACKAGE_VERSION, "%c%c%c%c-%d", &major1, &major2, &major3, &major4, &minor) > 4) - { - sprintf (version_string, "%c%c.%c%c.%d.0", major1, major2, major3, major4, minor); - } else - { - sprintf (version_string, "%c%c.%c%c.0.0", major1, major2, major3, major4); - } - - return version_string; -} - -int -main (int argc, char *argv[]) -{ - if (argc > 1) - { - if (!strcmp (argv[1], "-r")) /* xchat.rc/FILEVERSION, PRODUCTVERSION */ - { - printf ("#define COMMA_VERSION %s\n", comma ()); - } - else if (!strcmp (argv[1], "-a32")) /* xchat-wdk.iss/AppVerName */ - { - printf ("AppVerName=XChat-WDK %s (x86)\n", PACKAGE_VERSION); - } - else if (!strcmp (argv[1], "-a64")) /* xchat-wdk.iss/AppVerName */ - { - printf ("AppVerName=XChat-WDK %s (x64)\n", PACKAGE_VERSION); - } - else if (!strcmp (argv[1], "-v")) /* xchat-wdk.iss/AppVersion */ - { - printf ("AppVersion=%s\n", point ()); - } - else if (!strcmp (argv[1], "-i")) /* xchat-wdk.iss/VersionInfoVersion */ - { - printf ("VersionInfoVersion=%s\n", point ()); - } - else if (!strcmp (argv[1], "-o32")) /* xchat-wdk.iss/OutputBaseFilename */ - { - printf ("OutputBaseFilename=XChat-WDK %s x86\n", PACKAGE_VERSION); - } - else if (!strcmp (argv[1], "-o64")) /* xchat-wdk.iss/OutputBaseFilename */ - { - printf ("OutputBaseFilename=XChat-WDK %s x64\n", PACKAGE_VERSION); - } - else if (!strcmp (argv[1], "-v")) /* version.txt */ - { - printf ("%s", PACKAGE_VERSION); - } else - { - printf ("usage:\n\t-a\txchat-wdk.iss/AppVerName\n\t-i\txchat-wdk.iss/VersionInfoVersion\n\t-o\txchat-wdk.iss/OutputBaseFilename\n\t-r\txchat.rc/FILEVERSION, PRODUCTVERSION\n\t-v\txchat-wdk.iss/AppVersion\n"); - } - } else - { - printf ("usage:\n\t-a\txchat-wdk.iss/AppVerName\n\t-i\txchat-wdk.iss/VersionInfoVersion\n\t-o\txchat-wdk.iss/OutputBaseFilename\n\t-r\txchat.rc/FILEVERSION, PRODUCTVERSION\n\t-v\txchat-wdk.iss/AppVersion\n"); - } - -#if 0 /* ugly hack */ - switch ((int) argv[1][0]) - { - case 'r': /* xchat.rc/FILEVERSION, PRODUCTVERSION*/ - printf ("#define COMMA_VERSION \"%s\"\n", comma ()); - break; - case 'a': /* xchat-wdk.iss/AppVerName */ - printf ("AppVerName=XChat-WDK %s\n", PACKAGE_VERSION); - break; - case 'v': /* xchat-wdk.iss/AppVersion */ - printf ("AppVersion=%s\n", point ()); - break; - case 'i': /* xchat-wdk.iss/VersionInfoVersion */ - printf ("VersionInfoVersion=%s\n", point ()); - break; - case 'o': /* xchat-wdk.iss/OutputBaseFilename */ - printf ("OutputBaseFilename=XChat-WDK %s\n", PACKAGE_VERSION); - break; - case 'u': /* version.txt */ - printf ("%s", PACKAGE_VERSION); - break; - default: - printf ("use a, i, o, r or v.\n"); - break; - } -#endif - - return 0; -} diff --git a/win32/xchat-wdk-spell.skel.iss b/win32/xchat-wdk-spell.skel.iss deleted file mode 100644 index 6d1b26b6..00000000 --- a/win32/xchat-wdk-spell.skel.iss +++ /dev/null @@ -1,39 +0,0 @@ -AppName=XChat-WDK Spelling Dictionaries -AppVerName=XChat-WDK Spelling Dictionaries r1 -AppVersion=1.0 -VersionInfoVersion=1.0 -OutputBaseFilename=XChat-WDK Spelling Dictionaries r1 -AppPublisher=XChat-WDK -AppPublisherURL=http://code.google.com/p/xchat-wdk/ -AppCopyright=Copyright (C) 1998-2010 Peter Zelezny -AppSupportURL=http://code.google.com/p/xchat-wdk/issues/list -AppUpdatesURL=http://code.google.com/p/xchat-wdk/wiki/InfoXChat -LicenseFile=COPYING -UninstallDisplayIcon={app}\xchat.exe -UninstallDisplayName=XChat-WDK Spelling Dictionaries -DefaultDirName={pf}\XChat-WDK -DefaultGroupName=XChat-WDK -DisableProgramGroupPage=yes -SolidCompression=yes -SourceDir=..\tmp-spell -OutputDir=..\build -FlatComponentsList=no -PrivilegesRequired=none -ShowComponentSizes=no -CreateUninstallRegKey=not IsTaskSelected('portable') -Uninstallable=not IsTaskSelected('portable') -DirExistsWarning=no -ArchitecturesAllowed=x86 x64 -ArchitecturesInstallIn64BitMode=x64 - -[Tasks] -Name: portable; Description: "Yes"; GroupDescription: "Portable Install (no Registry entries, no Start Menu icons, no uninstaller):"; Flags: unchecked - -[Files] -Source: "share\myspell\*"; DestDir: "{app}\share\myspell"; Flags: createallsubdirs recursesubdirs - -[Icons] -Name: "{group}\Uninstall Spelling Dictionaries"; Filename: "{uninstallexe}"; Tasks: not portable - -[Messages] -BeveledLabel= XChat-WDK