From b63b93fb56b967427b1e3ac1b8adb6d16c7d245f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 16 Nov 2011 16:06:07 -0600 Subject: Finish rename from prior commit --- win/kdelibs_export_win.h | 152 --------------------------- win/kdelibs_global_win.h | 200 ------------------------------------ win/tdelibs_export_win.h | 152 +++++++++++++++++++++++++++ win/tdelibs_global_win.h | 200 ++++++++++++++++++++++++++++++++++++ win/tools/build_kdelibs_dbg | 82 --------------- win/tools/build_kdelibs_rel | 73 ------------- win/tools/build_tdelibs_dbg | 82 +++++++++++++++ win/tools/build_tdelibs_rel | 73 +++++++++++++ win/tools/collect_kdelibs_pro_files | 22 ---- win/tools/collect_tdelibs_pro_files | 22 ++++ win/tools/update_kdelibs_pro_files | 30 ------ win/tools/update_tdelibs_pro_files | 30 ++++++ 12 files changed, 559 insertions(+), 559 deletions(-) delete mode 100644 win/kdelibs_export_win.h delete mode 100644 win/kdelibs_global_win.h create mode 100644 win/tdelibs_export_win.h create mode 100644 win/tdelibs_global_win.h delete mode 100644 win/tools/build_kdelibs_dbg delete mode 100644 win/tools/build_kdelibs_rel create mode 100644 win/tools/build_tdelibs_dbg create mode 100644 win/tools/build_tdelibs_rel delete mode 100755 win/tools/collect_kdelibs_pro_files create mode 100755 win/tools/collect_tdelibs_pro_files delete mode 100755 win/tools/update_kdelibs_pro_files create mode 100755 win/tools/update_tdelibs_pro_files (limited to 'win') diff --git a/win/kdelibs_export_win.h b/win/kdelibs_export_win.h deleted file mode 100644 index 17663a5fa..000000000 --- a/win/kdelibs_export_win.h +++ /dev/null @@ -1,152 +0,0 @@ -/* - This file is part of the KDE libraries - Copyright (C) 2004 Jaroslaw Staniek - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include /* to avoid #includes */ - -#define KPATH_SEPARATOR ';' -#define popen _popen -#define pclose _pclose - -#define KDE_IMPORT __declspec(dllimport) - -#ifdef MAKE_TDECORE_LIB -# define TDECORE_EXPORT KDE_EXPORT -#else -# ifndef TDECORE_EXPORT -# define TDECORE_EXPORT KDE_IMPORT //for apps and other libs -# endif -#endif - -#ifdef MAKE_KDEWIN32_LIB -# define KDEWIN32_EXPORT KDE_EXPORT -#else -# define KDEWIN32_EXPORT KDE_IMPORT -#endif - -/* some classes, i.e. KDock* already use EXPORT_* macro: define it too */ -#ifdef MAKE_TDEUI_LIB -# define TDEUI_EXPORT KDE_EXPORT -# define EXPORT_DOCKCLASS KDE_EXPORT -#elif KDE_MAKE_LIB -# define TDEUI_EXPORT KDE_IMPORT -# define EXPORT_DOCKCLASS KDE_IMPORT /* for library build export docklass by default */ -#else -# define TDEUI_EXPORT -# define EXPORT_DOCKCLASS -#endif - -#ifdef MAKE_TDEFX_LIB -# define TDEFX_EXPORT KDE_EXPORT -#else -# define TDEFX_EXPORT KDE_IMPORT -#endif - -#ifdef MAKE_TDEPRINT_LIB -# define TDEPRINT_EXPORT KDE_EXPORT -#else -# define TDEPRINT_EXPORT KDE_IMPORT -#endif - -#ifndef KIO_EXPORT -# ifdef MAKE_KIO_LIB -# define KIO_EXPORT KDE_EXPORT -# else -# define KIO_EXPORT KDE_IMPORT -# endif -#endif - -#ifdef MAKE_DCOP_LIB -# define DCOP_EXPORT KDE_EXPORT -#else -# define DCOP_EXPORT KDE_IMPORT -#endif - -#ifdef MAKE_KPARTS_LIB -# define KPARTS_EXPORT KDE_EXPORT -#else -# define KPARTS_EXPORT KDE_IMPORT -#endif - -#ifdef MAKE_KTEXTEDITOR_LIB -# define KTEXTEDITOR_EXPORT KDE_EXPORT -#else -# define KTEXTEDITOR_EXPORT KDE_IMPORT -#endif - -#ifdef MAKE_KABC_LIB -# define KABC_EXPORT KDE_EXPORT -#else -# define KABC_EXPORT KDE_IMPORT -#endif - - -#ifdef MAKE_KVCARD_LIB -# define KVCARD_EXPORT KDE_EXPORT -#else -# define KVCARD_EXPORT KDE_IMPORT -#endif - -#ifdef MAKE_KRESOURCES_LIB -# define KRESOURCES_EXPORT KDE_EXPORT -#else -# define KRESOURCES_EXPORT KDE_IMPORT -#endif - -#ifdef MAKE_TDESU_LIB -# define TDESU_EXPORT KDE_EXPORT -#else -# define TDESU_EXPORT KDE_IMPORT -#endif - -// all KStyle libs -#ifdef MAKE_KSTYLE_LIB -# define KSTYLE_EXPORT KDE_EXPORT -#else -# define KSTYLE_EXPORT KDE_IMPORT -#endif - -#ifdef MAKE_KMDI_LIB -# define KMDI_EXPORT KDE_EXPORT -#else -# define KMDI_EXPORT KDE_IMPORT -#endif - -#ifdef MAKE_KUTILS_LIB -# define KUTILS_EXPORT KDE_EXPORT -#else -# define KUTILS_EXPORT KDE_IMPORT -#endif - -#ifdef MAKE_KATEPARTINTERFACES_LIB -# define KATEPARTINTERFACES_EXPORT KDE_EXPORT -#else -# define KATEPARTINTERFACES_EXPORT KDE_IMPORT -#endif - -#ifdef MAKE_KATEPART_LIB -# define KATEPART_EXPORT KDE_EXPORT -#else -# define KATEPART_EXPORT KDE_IMPORT -#endif - -#ifdef MAKE_KHTML_LIB -# define KHTML_EXPORT KDE_EXPORT -#else -# define KHTML_EXPORT KDE_IMPORT -#endif diff --git a/win/kdelibs_global_win.h b/win/kdelibs_global_win.h deleted file mode 100644 index dfb3432e8..000000000 --- a/win/kdelibs_global_win.h +++ /dev/null @@ -1,200 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2003-2005 Jaroslaw Staniek - - Global definitions for KDElibs/win32 (win32) - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include - -/*! Bootstrap */ -#define kdemain \ -kde_start(int argc, char **argv); \ -__declspec(dllimport) void kde_bootstrap(); \ -__declspec(dllimport) void kde_destroy(); \ -int main(int argc, char **argv) \ -{ kde_bootstrap(); const int retcode = kde_start(argc, argv); kde_destroy(); return retcode; } \ -int kde_start - - -#ifndef WIN32 -# define WIN32 -#endif - -#ifndef HAVE_CONFIG_H -# define HAVE_CONFIG_H 1 -#endif - -#ifndef HAVE_STRING_H -# define HAVE_STRING_H 1 -#endif - -#ifndef HAVE_SYS_STAT_H -# define HAVE_SYS_STAT_H 1 -#endif - -#ifndef HAVE_SYS_PARAM_H -# define HAVE_SYS_PARAM_H 1 -#endif - -#define KDE_DISTRIBUTION_TEXT "KDE Libraries for MS Windows" -#define KDE_COMPILING_OS "win32" -#ifdef _MSC_VER -# if _MSC_VER < 1300 -# define KDE_COMPILER_VERSION "MSVC++ 6.0" -# elif _MSC_VER <= 1300 -# define KDE_COMPILER_VERSION "MSVC++ 7.0" -# elif _MSC_VER <= 1310 -# define KDE_COMPILER_VERSION "MSVC++ 7.1" -# elif _MSC_VER <= 1400 -# define KDE_COMPILER_VERSION "MSVC++ 8.0" -# else 1400 -# define KDE_COMPILER_VERSION "MSVC++ >8.0" -# endif -#endif - -#ifndef M_PI -# define M_PI 3.14159265358979323846 -#endif - -#ifndef NULL -# define NULL 0 -#endif - -/* -#ifdef __cplusplus -#include - -# ifndef KDEDIR -# define KDEDIR TQString(KDEWIN32_DIR) -# endif -# ifndef __KDE_BINDIR -# define __KDE_BINDIR TQString(KDEWIN32_DIR "/bin") -# endif -#endif -*/ - -# ifndef __pid_t_defined - //typedef __pid_t pid_t; - typedef unsigned int pid_t; -# define __pid_t_defined -# endif - -# ifndef __uid_t_defined -//typedef __uid_t uid_t; - typedef unsigned int __uid_t; - typedef __uid_t uid_t; -# define __uid_t_defined -# endif - -# ifndef __gid_t_defined -//typedef __uid_t uid_t; - typedef unsigned int __gid_t; - typedef __gid_t gid_t; -# define __gid_t_defined -# endif - - typedef char* caddr_t; - - -#define snprintf _snprintf -#define vsnprintf _vsnprintf - - -/* should be in */ -typedef int mode_t; - -#if defined(_MSC_VER) - -# if (_MSC_VER <= 1200) - /* Force Conformance for For Loop Scope (/Zc:forScope) is only allowed for - MSVC++ version > 6.0 - -this option controls the scope of variables - defined as part of the For loop control statement. Traditionally, Microsoft - extended the scope of loop control variables defined in the loop control statement - beyond the scope of the loop. Such behavior violates the ANSI C/C++ standard - and may cause compiler errors when compiling ANSI C/C++ code with Microsoft C++. - Simple (dirty) macro trick to fix the compile problem for msvc6 - ( see http://q12.org/pipermail/ode/2003-January/002811.html - and http://support.microsoft.com/default.aspx?scid=kb;EN-US;167748 ) - */ -# define for if (0); else for -# endif - -//operator (char*) caused errors -//#define QT_NO_ASCII_CAST - -/* warning C4150: deletion of pointer to incomplete type 'type'; no destructor called - -The delete operator was called to delete the given type, which was -declared but not defined. The compiler was unable to find any destructors for the given type. -*/ -#pragma warning( disable: 4150 ) - - -/* warning C4521: qmultiple copy constructors specified -*/ -#pragma warning( disable: 4521 ) - -/* warning C4251: 'identifier' : class 'type' needs to have dll-interface - to be used by clients of class 'type2' -*/ -#pragma warning( disable: 4251 ) - -/* identifier was truncated to '255'.. */ -# pragma warning(disable: 4786) - -/* warning C4250: ...: inherits ... via dominanceidentifier */ -# pragma warning(disable: 4250) - -# pragma warning(disable: 4006) /*libxxx : warning LNK4006: - ".... already defined in kaction.obj; second definition ignored" */ - -/* disable C4100: unreferenced formal parameter */ -# pragma warning(disable: 4100) - -/* disable C4101: unreferenced local variable */ -# pragma warning(disable: 4101) - -/* disable C4189: local variable is initialized but not referenced */ -# pragma warning(disable: 4189) - -# if (_MSC_VER >= 1300) -/* disable C4288: nonstandard extension used : 'i' : loop control variable - declared in the for-loop is used outside the for-loop scope; - it conflicts with the declaration in the outer scope */ -# pragma warning(disable: 4288) - -/* disable 4996: warnings for deprecated symbols */ -# pragma warning(disable: 4996) -# endif - -#endif - -/*#if (_MSC_VER >= 1300) && (WINVER < 0x0500) -#ifdef __cplusplus -extern "C" { -#endif -*/ -/* VC7 or later, building with pre-VC7 runtime libraries */ -/*extern "C"*/ long _ftol( double ); /* defined by VC6 C libs */ -/*extern "C" KDEWIN32_EXPORT long _ftol2( double dblSource ); */ -/*#ifdef __cplusplus -inline long _cdecl _ftol2( double dblSource ) { return _ftol( dblSource ); } -} -#endif*/ - diff --git a/win/tdelibs_export_win.h b/win/tdelibs_export_win.h new file mode 100644 index 000000000..17663a5fa --- /dev/null +++ b/win/tdelibs_export_win.h @@ -0,0 +1,152 @@ +/* + This file is part of the KDE libraries + Copyright (C) 2004 Jaroslaw Staniek + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include /* to avoid #includes */ + +#define KPATH_SEPARATOR ';' +#define popen _popen +#define pclose _pclose + +#define KDE_IMPORT __declspec(dllimport) + +#ifdef MAKE_TDECORE_LIB +# define TDECORE_EXPORT KDE_EXPORT +#else +# ifndef TDECORE_EXPORT +# define TDECORE_EXPORT KDE_IMPORT //for apps and other libs +# endif +#endif + +#ifdef MAKE_KDEWIN32_LIB +# define KDEWIN32_EXPORT KDE_EXPORT +#else +# define KDEWIN32_EXPORT KDE_IMPORT +#endif + +/* some classes, i.e. KDock* already use EXPORT_* macro: define it too */ +#ifdef MAKE_TDEUI_LIB +# define TDEUI_EXPORT KDE_EXPORT +# define EXPORT_DOCKCLASS KDE_EXPORT +#elif KDE_MAKE_LIB +# define TDEUI_EXPORT KDE_IMPORT +# define EXPORT_DOCKCLASS KDE_IMPORT /* for library build export docklass by default */ +#else +# define TDEUI_EXPORT +# define EXPORT_DOCKCLASS +#endif + +#ifdef MAKE_TDEFX_LIB +# define TDEFX_EXPORT KDE_EXPORT +#else +# define TDEFX_EXPORT KDE_IMPORT +#endif + +#ifdef MAKE_TDEPRINT_LIB +# define TDEPRINT_EXPORT KDE_EXPORT +#else +# define TDEPRINT_EXPORT KDE_IMPORT +#endif + +#ifndef KIO_EXPORT +# ifdef MAKE_KIO_LIB +# define KIO_EXPORT KDE_EXPORT +# else +# define KIO_EXPORT KDE_IMPORT +# endif +#endif + +#ifdef MAKE_DCOP_LIB +# define DCOP_EXPORT KDE_EXPORT +#else +# define DCOP_EXPORT KDE_IMPORT +#endif + +#ifdef MAKE_KPARTS_LIB +# define KPARTS_EXPORT KDE_EXPORT +#else +# define KPARTS_EXPORT KDE_IMPORT +#endif + +#ifdef MAKE_KTEXTEDITOR_LIB +# define KTEXTEDITOR_EXPORT KDE_EXPORT +#else +# define KTEXTEDITOR_EXPORT KDE_IMPORT +#endif + +#ifdef MAKE_KABC_LIB +# define KABC_EXPORT KDE_EXPORT +#else +# define KABC_EXPORT KDE_IMPORT +#endif + + +#ifdef MAKE_KVCARD_LIB +# define KVCARD_EXPORT KDE_EXPORT +#else +# define KVCARD_EXPORT KDE_IMPORT +#endif + +#ifdef MAKE_KRESOURCES_LIB +# define KRESOURCES_EXPORT KDE_EXPORT +#else +# define KRESOURCES_EXPORT KDE_IMPORT +#endif + +#ifdef MAKE_TDESU_LIB +# define TDESU_EXPORT KDE_EXPORT +#else +# define TDESU_EXPORT KDE_IMPORT +#endif + +// all KStyle libs +#ifdef MAKE_KSTYLE_LIB +# define KSTYLE_EXPORT KDE_EXPORT +#else +# define KSTYLE_EXPORT KDE_IMPORT +#endif + +#ifdef MAKE_KMDI_LIB +# define KMDI_EXPORT KDE_EXPORT +#else +# define KMDI_EXPORT KDE_IMPORT +#endif + +#ifdef MAKE_KUTILS_LIB +# define KUTILS_EXPORT KDE_EXPORT +#else +# define KUTILS_EXPORT KDE_IMPORT +#endif + +#ifdef MAKE_KATEPARTINTERFACES_LIB +# define KATEPARTINTERFACES_EXPORT KDE_EXPORT +#else +# define KATEPARTINTERFACES_EXPORT KDE_IMPORT +#endif + +#ifdef MAKE_KATEPART_LIB +# define KATEPART_EXPORT KDE_EXPORT +#else +# define KATEPART_EXPORT KDE_IMPORT +#endif + +#ifdef MAKE_KHTML_LIB +# define KHTML_EXPORT KDE_EXPORT +#else +# define KHTML_EXPORT KDE_IMPORT +#endif diff --git a/win/tdelibs_global_win.h b/win/tdelibs_global_win.h new file mode 100644 index 000000000..dfb3432e8 --- /dev/null +++ b/win/tdelibs_global_win.h @@ -0,0 +1,200 @@ +/* This file is part of the KDE project + Copyright (C) 2003-2005 Jaroslaw Staniek + + Global definitions for KDElibs/win32 (win32) + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this program; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include + +/*! Bootstrap */ +#define kdemain \ +kde_start(int argc, char **argv); \ +__declspec(dllimport) void kde_bootstrap(); \ +__declspec(dllimport) void kde_destroy(); \ +int main(int argc, char **argv) \ +{ kde_bootstrap(); const int retcode = kde_start(argc, argv); kde_destroy(); return retcode; } \ +int kde_start + + +#ifndef WIN32 +# define WIN32 +#endif + +#ifndef HAVE_CONFIG_H +# define HAVE_CONFIG_H 1 +#endif + +#ifndef HAVE_STRING_H +# define HAVE_STRING_H 1 +#endif + +#ifndef HAVE_SYS_STAT_H +# define HAVE_SYS_STAT_H 1 +#endif + +#ifndef HAVE_SYS_PARAM_H +# define HAVE_SYS_PARAM_H 1 +#endif + +#define KDE_DISTRIBUTION_TEXT "KDE Libraries for MS Windows" +#define KDE_COMPILING_OS "win32" +#ifdef _MSC_VER +# if _MSC_VER < 1300 +# define KDE_COMPILER_VERSION "MSVC++ 6.0" +# elif _MSC_VER <= 1300 +# define KDE_COMPILER_VERSION "MSVC++ 7.0" +# elif _MSC_VER <= 1310 +# define KDE_COMPILER_VERSION "MSVC++ 7.1" +# elif _MSC_VER <= 1400 +# define KDE_COMPILER_VERSION "MSVC++ 8.0" +# else 1400 +# define KDE_COMPILER_VERSION "MSVC++ >8.0" +# endif +#endif + +#ifndef M_PI +# define M_PI 3.14159265358979323846 +#endif + +#ifndef NULL +# define NULL 0 +#endif + +/* +#ifdef __cplusplus +#include + +# ifndef KDEDIR +# define KDEDIR TQString(KDEWIN32_DIR) +# endif +# ifndef __KDE_BINDIR +# define __KDE_BINDIR TQString(KDEWIN32_DIR "/bin") +# endif +#endif +*/ + +# ifndef __pid_t_defined + //typedef __pid_t pid_t; + typedef unsigned int pid_t; +# define __pid_t_defined +# endif + +# ifndef __uid_t_defined +//typedef __uid_t uid_t; + typedef unsigned int __uid_t; + typedef __uid_t uid_t; +# define __uid_t_defined +# endif + +# ifndef __gid_t_defined +//typedef __uid_t uid_t; + typedef unsigned int __gid_t; + typedef __gid_t gid_t; +# define __gid_t_defined +# endif + + typedef char* caddr_t; + + +#define snprintf _snprintf +#define vsnprintf _vsnprintf + + +/* should be in */ +typedef int mode_t; + +#if defined(_MSC_VER) + +# if (_MSC_VER <= 1200) + /* Force Conformance for For Loop Scope (/Zc:forScope) is only allowed for + MSVC++ version > 6.0 + -this option controls the scope of variables + defined as part of the For loop control statement. Traditionally, Microsoft + extended the scope of loop control variables defined in the loop control statement + beyond the scope of the loop. Such behavior violates the ANSI C/C++ standard + and may cause compiler errors when compiling ANSI C/C++ code with Microsoft C++. + Simple (dirty) macro trick to fix the compile problem for msvc6 + ( see http://q12.org/pipermail/ode/2003-January/002811.html + and http://support.microsoft.com/default.aspx?scid=kb;EN-US;167748 ) + */ +# define for if (0); else for +# endif + +//operator (char*) caused errors +//#define QT_NO_ASCII_CAST + +/* warning C4150: deletion of pointer to incomplete type 'type'; no destructor called + +The delete operator was called to delete the given type, which was +declared but not defined. The compiler was unable to find any destructors for the given type. +*/ +#pragma warning( disable: 4150 ) + + +/* warning C4521: qmultiple copy constructors specified +*/ +#pragma warning( disable: 4521 ) + +/* warning C4251: 'identifier' : class 'type' needs to have dll-interface + to be used by clients of class 'type2' +*/ +#pragma warning( disable: 4251 ) + +/* identifier was truncated to '255'.. */ +# pragma warning(disable: 4786) + +/* warning C4250: ...: inherits ... via dominanceidentifier */ +# pragma warning(disable: 4250) + +# pragma warning(disable: 4006) /*libxxx : warning LNK4006: + ".... already defined in kaction.obj; second definition ignored" */ + +/* disable C4100: unreferenced formal parameter */ +# pragma warning(disable: 4100) + +/* disable C4101: unreferenced local variable */ +# pragma warning(disable: 4101) + +/* disable C4189: local variable is initialized but not referenced */ +# pragma warning(disable: 4189) + +# if (_MSC_VER >= 1300) +/* disable C4288: nonstandard extension used : 'i' : loop control variable + declared in the for-loop is used outside the for-loop scope; + it conflicts with the declaration in the outer scope */ +# pragma warning(disable: 4288) + +/* disable 4996: warnings for deprecated symbols */ +# pragma warning(disable: 4996) +# endif + +#endif + +/*#if (_MSC_VER >= 1300) && (WINVER < 0x0500) +#ifdef __cplusplus +extern "C" { +#endif +*/ +/* VC7 or later, building with pre-VC7 runtime libraries */ +/*extern "C"*/ long _ftol( double ); /* defined by VC6 C libs */ +/*extern "C" KDEWIN32_EXPORT long _ftol2( double dblSource ); */ +/*#ifdef __cplusplus +inline long _cdecl _ftol2( double dblSource ) { return _ftol( dblSource ); } +} +#endif*/ + diff --git a/win/tools/build_kdelibs_dbg b/win/tools/build_kdelibs_dbg deleted file mode 100644 index cabec259f..000000000 --- a/win/tools/build_kdelibs_dbg +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash -# compile entire tdelibs/win32 in debug mode -# (c) 2003-2005, Jaroslaw Staniek, js@iidea.pl - -if [ "$1" == "noclean" ] ; then - noclean=1 -fi - -update_tdelibs_pro_files || exit 1 -.copy_missing_headers || exit 1 -source .build_tdelibs_comon || exit 1 - -cd "$KDELIBS" - -echo "-------------------------------------------------" -echo "Building Debug Version of KDElibs/win32" -echo "Source directory: \$KDELIBS = $KDELIBS" -echo "Version: $KDE_VER_MAJ.$KDE_VER_MIN.$KDE_VER_PAT" -echo "Destination directory: \$KDEDIR = $KDEDIR" -if [ -n $noclean ] ; then - echo "Options: noclean" -fi -echo "-------------------------------------------------" -echo - -# special -cd win/9x && $make || exit 1 -cd "$pwd" - -if [ -d "kstyles/thinkeramik/widget-engine" ] ; then - additional="kstyles/thinkeramik/widget-engine/genembed kstyles/thinkeramik/widget-engine " -fi - -# all -for d in \ -win \ -libltdl \ -dcop/KDE-ICE \ -dcop \ -dcop/dcopidl \ -dcop/dcopidl2cpp \ -dcop/dcopserver \ -dcop/dcopserver_shutdown \ -dcop/iceauth \ -tdefx \ -$additional \ -tdecore \ -tdeui \ -kio \ -kresources \ -kabc/vcard \ -kabc \ -kutils \ -kparts \ -kmdi \ -kioslave/gzip \ -kioslave/bzip2 \ -interfaces/ktexteditor \ -kate/interfaces \ -kate/part \ - ; do - echo ================== $d ================= - cd $d || exit 1 - if [ -z $noclean ] ; then - $make clean - fi - qmake && $make || exit 1 - cd $pwd -done - -cd kdewidgets -qmake makekdewidgets.pro && $make clean && $make || exit 1 -qmake && $make clean && $make || exit 1 - -# copy kdewidgets plugin for Qt Designer -cp $KDEDIR/lib/trinity/plugins/designer/kdewidgets.dll $QTDIR/plugins/designer/ - -cd $pwd - -cd kded -./makeall.sh || exit 1 -cd $pwd diff --git a/win/tools/build_kdelibs_rel b/win/tools/build_kdelibs_rel deleted file mode 100644 index 7490c4866..000000000 --- a/win/tools/build_kdelibs_rel +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash -# compile entire tdelibs/win32 in release mode -# (c) 2003-2005, Jaroslaw Staniek, js@iidea.pl - -if [ "$1" == "noclean" ] ; then - noclean=1 -fi - -update_tdelibs_pro_files || exit 1 -.copy_missing_headers || exit 1 -source .build_tdelibs_comon || exit 1 - -cd "$KDELIBS" - -echo "-------------------------------------------------" -echo "Building Release Version of KDElibs/win32" -echo "Source directory: \$KDELIBS = $KDELIBS" -echo "Version: $KDE_VER_MAJ.$KDE_VER_MIN.$KDE_VER_PAT" -echo "Destination directory: \$KDEDIR = $KDEDIR" -if [ -n $noclean ] ; then - echo "Options: noclean" -fi -echo "-------------------------------------------------" -echo - -# special -cd win/9x || exit 1 -if [ "$1" != "noclean" ] ; then - $make -f Makefile.rel clean -fi -$make -f Makefile.rel || exit 1 -cd $pwd - -# all -for d in \ -win \ -libltdl \ -dcop/KDE-ICE \ -dcop \ -dcop/dcopidl \ -dcop/dcopidl2cpp \ -dcop/dcopserver \ -dcop/dcopserver_shutdown \ -dcop/iceauth \ -tdefx \ -tdecore \ -tdeui \ -kstyles/thinkeramik/widget-engine \ -kio \ -kresources \ -kabc/vcard \ -kabc \ -kutils \ -kparts \ -kmdi \ -kioslave/gzip \ -kioslave/bzip2 \ -interfaces/ktexteditor \ -kate/interfaces \ -kate/part \ - ; do - echo ================== $d ================= - cd $d || exit 1 - if [ -z $noclean ] ; then - $make -f Makefile.release clean - fi - mkrel || exit 1 - cd $pwd -done - -cd kded -./makeall_rel.sh || exit 1 -cd $pwd diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg new file mode 100644 index 000000000..cabec259f --- /dev/null +++ b/win/tools/build_tdelibs_dbg @@ -0,0 +1,82 @@ +#!/bin/bash +# compile entire tdelibs/win32 in debug mode +# (c) 2003-2005, Jaroslaw Staniek, js@iidea.pl + +if [ "$1" == "noclean" ] ; then + noclean=1 +fi + +update_tdelibs_pro_files || exit 1 +.copy_missing_headers || exit 1 +source .build_tdelibs_comon || exit 1 + +cd "$KDELIBS" + +echo "-------------------------------------------------" +echo "Building Debug Version of KDElibs/win32" +echo "Source directory: \$KDELIBS = $KDELIBS" +echo "Version: $KDE_VER_MAJ.$KDE_VER_MIN.$KDE_VER_PAT" +echo "Destination directory: \$KDEDIR = $KDEDIR" +if [ -n $noclean ] ; then + echo "Options: noclean" +fi +echo "-------------------------------------------------" +echo + +# special +cd win/9x && $make || exit 1 +cd "$pwd" + +if [ -d "kstyles/thinkeramik/widget-engine" ] ; then + additional="kstyles/thinkeramik/widget-engine/genembed kstyles/thinkeramik/widget-engine " +fi + +# all +for d in \ +win \ +libltdl \ +dcop/KDE-ICE \ +dcop \ +dcop/dcopidl \ +dcop/dcopidl2cpp \ +dcop/dcopserver \ +dcop/dcopserver_shutdown \ +dcop/iceauth \ +tdefx \ +$additional \ +tdecore \ +tdeui \ +kio \ +kresources \ +kabc/vcard \ +kabc \ +kutils \ +kparts \ +kmdi \ +kioslave/gzip \ +kioslave/bzip2 \ +interfaces/ktexteditor \ +kate/interfaces \ +kate/part \ + ; do + echo ================== $d ================= + cd $d || exit 1 + if [ -z $noclean ] ; then + $make clean + fi + qmake && $make || exit 1 + cd $pwd +done + +cd kdewidgets +qmake makekdewidgets.pro && $make clean && $make || exit 1 +qmake && $make clean && $make || exit 1 + +# copy kdewidgets plugin for Qt Designer +cp $KDEDIR/lib/trinity/plugins/designer/kdewidgets.dll $QTDIR/plugins/designer/ + +cd $pwd + +cd kded +./makeall.sh || exit 1 +cd $pwd diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel new file mode 100644 index 000000000..7490c4866 --- /dev/null +++ b/win/tools/build_tdelibs_rel @@ -0,0 +1,73 @@ +#!/bin/bash +# compile entire tdelibs/win32 in release mode +# (c) 2003-2005, Jaroslaw Staniek, js@iidea.pl + +if [ "$1" == "noclean" ] ; then + noclean=1 +fi + +update_tdelibs_pro_files || exit 1 +.copy_missing_headers || exit 1 +source .build_tdelibs_comon || exit 1 + +cd "$KDELIBS" + +echo "-------------------------------------------------" +echo "Building Release Version of KDElibs/win32" +echo "Source directory: \$KDELIBS = $KDELIBS" +echo "Version: $KDE_VER_MAJ.$KDE_VER_MIN.$KDE_VER_PAT" +echo "Destination directory: \$KDEDIR = $KDEDIR" +if [ -n $noclean ] ; then + echo "Options: noclean" +fi +echo "-------------------------------------------------" +echo + +# special +cd win/9x || exit 1 +if [ "$1" != "noclean" ] ; then + $make -f Makefile.rel clean +fi +$make -f Makefile.rel || exit 1 +cd $pwd + +# all +for d in \ +win \ +libltdl \ +dcop/KDE-ICE \ +dcop \ +dcop/dcopidl \ +dcop/dcopidl2cpp \ +dcop/dcopserver \ +dcop/dcopserver_shutdown \ +dcop/iceauth \ +tdefx \ +tdecore \ +tdeui \ +kstyles/thinkeramik/widget-engine \ +kio \ +kresources \ +kabc/vcard \ +kabc \ +kutils \ +kparts \ +kmdi \ +kioslave/gzip \ +kioslave/bzip2 \ +interfaces/ktexteditor \ +kate/interfaces \ +kate/part \ + ; do + echo ================== $d ================= + cd $d || exit 1 + if [ -z $noclean ] ; then + $make -f Makefile.release clean + fi + mkrel || exit 1 + cd $pwd +done + +cd kded +./makeall_rel.sh || exit 1 +cd $pwd diff --git a/win/tools/collect_kdelibs_pro_files b/win/tools/collect_kdelibs_pro_files deleted file mode 100755 index 3925f675e..000000000 --- a/win/tools/collect_kdelibs_pro_files +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# Copies all used .pro (and a few shell) files tdelibs/ to tdelibs/win/pro_files/ -# what makes it easier to commit that to KDE CVS -# (c) 2005, Jaroslaw Staniek - -dest=win/pro_files -mkdir -p $dest - -.check_kde_env || exit 1 - -cd "$KDELIBS" - -for pro in `find . -name \*.pro | grep -v "\/\.\|^\.\/win/"` kded/makeall.sh kded/makeall_rel.sh ; do - dir=`dirname "$pro"` - mkdir -p "$dest/$dir" - if [ "$pro" -nt "$dest/$pro" ] ; then - cp -p "$pro" "$dest/$pro" - echo "$pro" - fi -done - diff --git a/win/tools/collect_tdelibs_pro_files b/win/tools/collect_tdelibs_pro_files new file mode 100755 index 000000000..3925f675e --- /dev/null +++ b/win/tools/collect_tdelibs_pro_files @@ -0,0 +1,22 @@ +#!/bin/bash + +# Copies all used .pro (and a few shell) files tdelibs/ to tdelibs/win/pro_files/ +# what makes it easier to commit that to KDE CVS +# (c) 2005, Jaroslaw Staniek + +dest=win/pro_files +mkdir -p $dest + +.check_kde_env || exit 1 + +cd "$KDELIBS" + +for pro in `find . -name \*.pro | grep -v "\/\.\|^\.\/win/"` kded/makeall.sh kded/makeall_rel.sh ; do + dir=`dirname "$pro"` + mkdir -p "$dest/$dir" + if [ "$pro" -nt "$dest/$pro" ] ; then + cp -p "$pro" "$dest/$pro" + echo "$pro" + fi +done + diff --git a/win/tools/update_kdelibs_pro_files b/win/tools/update_kdelibs_pro_files deleted file mode 100755 index 92125fec1..000000000 --- a/win/tools/update_kdelibs_pro_files +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# Copies all used .pro (and a few shell) files from tdelibs/win/pro_files/ to tdelibs/ -# so they can be used to build tdelibs. -# Note: only newer files are copied over older. -# (c) 2005, Jaroslaw Staniek, js@iidea.pl - -.check_kde_env || exit 1 - -src=win/pro_files -dest=../.. - -cd "$KDELIBS/$src" - -for pro in `find . -name \*.pro -o -name \*.sh` ; do - dir=`dirname "$pro"` - if [ ! -d "$KDELIBS/$dir" ] ; then - echo "no \$KDELIBS/$dir directory: creating it" - mkdir -p "$KDELIBS/$dir" - fi - - if [ ! "$pro" -nt "$dest/$pro" ] ; then - true -# echo "*SKIPPED* $pro is not newer than destination in $KDELIBS" - else - echo "UPDATING \$KDELIBS/$pro" - cp $pro $dest/$pro - fi -done - diff --git a/win/tools/update_tdelibs_pro_files b/win/tools/update_tdelibs_pro_files new file mode 100755 index 000000000..92125fec1 --- /dev/null +++ b/win/tools/update_tdelibs_pro_files @@ -0,0 +1,30 @@ +#!/bin/bash + +# Copies all used .pro (and a few shell) files from tdelibs/win/pro_files/ to tdelibs/ +# so they can be used to build tdelibs. +# Note: only newer files are copied over older. +# (c) 2005, Jaroslaw Staniek, js@iidea.pl + +.check_kde_env || exit 1 + +src=win/pro_files +dest=../.. + +cd "$KDELIBS/$src" + +for pro in `find . -name \*.pro -o -name \*.sh` ; do + dir=`dirname "$pro"` + if [ ! -d "$KDELIBS/$dir" ] ; then + echo "no \$KDELIBS/$dir directory: creating it" + mkdir -p "$KDELIBS/$dir" + fi + + if [ ! "$pro" -nt "$dest/$pro" ] ; then + true +# echo "*SKIPPED* $pro is not newer than destination in $KDELIBS" + else + echo "UPDATING \$KDELIBS/$pro" + cp $pro $dest/$pro + fi +done + -- cgit v1.2.3