[PATCH] link_includes copy only new headers
Thiago A. Corrêa
thiagoacorrea at uol.com.br
Tue Oct 5 00:00:08 CEST 2004
hmmm is that faster? *g*
Copying is really a cheap operation... link_includes is quite fast already
=)
----- Original Message -----
From: "Christian Ehrlicher" <Ch.Ehrlicher at gmx.de>
To: "For developers interested in porting KDE to Windows using Cygwin"
<kde-cygwin at kde.org>
Sent: Monday, October 04, 2004 5:16 PM
Subject: [PATCH] link_includes copy only new headers
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hello
>
> Here a patch for link_includes which added a check wheater a header is
> changed or not. First it checks on size and then creates a md5-sum (from
> qmake/qtmd5.cpp). The default behaviour is to copy only the new headers.
> If you want to copy all, call link_includes with "-all".
> Also a small patch for qtmain.pro ${QTDIR} -> $(QTDIR)
>
> Christian
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.2.5 (MingW32)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
>
> iD8DBQFBYa+snNKwkgf+zVMRAn3MAKCZwFozgbWXKUnieoRAJq6VADXjegCeI/jA
> DpQjb/zKaje/mpJM3Ch3zcg=
> =sNGs
> -----END PGP SIGNATURE-----
>
----------------------------------------------------------------------------
----
> Index: misc/link_includes/link_includes.pro
> ===================================================================
> RCS file:
/cvsroot/kde-cygwin/qt-3/misc/link_includes/Attic/link_includes.pro,v
> retrieving revision 1.1.2.2.2.4
> diff -u -r1.1.2.2.2.4 link_includes.pro
> --- misc/link_includes/link_includes.pro 29 Sep 2004 19:45:02 -0000
1.1.2.2.2.4
> +++ misc/link_includes/link_includes.pro 4 Oct 2004 20:03:16 -0000
> @@ -1,8 +1,8 @@
> TEMPLATE = app
> CONFIG = console release qtinc
> TARGET += link_includes
> -DEFINES += QT_NO_DATASTREAM QT_NO_TEXTCODEC QT_NO_UNICODETABLES
QT_LITE_COMPONENT QT_NODLL QT_NO_STL QT_NO_COMPRESS
> -INCLUDEPATH += $(QTDIR)\src\tools $(QTDIR)\src\kernel $(QTDIR)\include
$(QTDIR)\include\private
> +DEFINES += QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_LITE_COMPONENT QT_NODLL
QT_NO_STL QT_NO_COMPRESS
> +INCLUDEPATH += $(QTDIR)\src\tools $(QTDIR)\src\kernel $(QTDIR)\include
$(QTDIR)\include\private $(QTDIR)\qmake
> DESTDIR = $(QTDIR)/bin
> OBJECTS_DIR = tmp
>
> @@ -21,10 +21,13 @@
> }
>
> # is this really all needed?
> +HEADERS += $(QTDIR)/qmake/qtmd5.h
> SOURCES += link_includes.cpp \
> + $(QTDIR)/qmake/qtmd5.cpp \
> $(QTDIR)/src/tools/qbitarray.cpp \
> $(QTDIR)/src/tools/qbuffer.cpp \
> $(QTDIR)/src/tools/qcstring.cpp \
> + $(QTDIR)/src/tools/qdatastream.cpp \
> $(QTDIR)/src/tools/qdatetime.cpp \
> $(QTDIR)/src/tools/qdir.cpp \
> $(QTDIR)/src/tools/qdir_win.cpp \
> Index: misc/link_includes/link_includes.cpp
> ===================================================================
> RCS file:
/cvsroot/kde-cygwin/qt-3/misc/link_includes/Attic/link_includes.cpp,v
> retrieving revision 1.1.2.4
> diff -u -r1.1.2.4 link_includes.cpp
> --- misc/link_includes/link_includes.cpp 22 Aug 2004 11:34:46 -0000
1.1.2.4
> +++ misc/link_includes/link_includes.cpp 2 Oct 2004 20:11:52 -0000
> @@ -16,15 +16,18 @@
> #include <stdlib.h>
> #include <qdir.h>
> #include <qregexp.h>
> +#include "qtmd5.h"
>
> bool verbose = false;
> bool dryrun = false;
> +bool onlyNew = true;
>
> void print_help( const QString &fn )
> {
> fprintf( stdout, "%s for Qt3/win32 (GPL-Version)", fn.ascii() );
> fprintf( stdout, "Usage: -verbose : be verbose" );
> fprintf( stdout, " -dryrun : don't copy files" );
> + fprintf( stdout, " -all : copy all files although src and
dst are the same" );
> exit( 0 );
> }
>
> @@ -64,15 +67,40 @@
>
> void copyFile( const QString& src, const QString& dest )
> {
> + QFile s( src );
> + QFile d( dest );
> + if ( onlyNew ) {
> + QFileInfo src_info( src );
> + QFileInfo dst_info( dest );
> + if ( ( dst_info.exists() ) && ( src_info.size() ==
dst_info.size() ) ) {
> + s.open( IO_ReadOnly | IO_Translate );
> + d.open( IO_ReadOnly | IO_Translate );
> + QByteArray s_ba = s.readAll();
> + if ( qtMD5( s_ba ) == qtMD5( d.readAll() ) ) {
> + s.close();
> + d.close();
> + if ( verbose )
> + fprintf( stdout, "File %s isn't changed -
skipping\n",
> + QDir::convertSeparators( src ).ascii() );
> + return ;
> + }
> + if ( dryrun )
> + return ;
> + s.close();
> + d.close();
> + d.open( IO_WriteOnly | IO_Truncate | IO_Translate );
> + d.writeBlock( s_ba );
> + d.close();
> + return ;
> + }
> + }
> if ( verbose )
> fprintf( stdout, "copying %s to %s\n", QDir::convertSeparators(
src ).ascii(),
> QDir::convertSeparators( dest ).ascii() );
> -
> if ( dryrun )
> return ;
>
> - QFile s( src );
> - QFile d( dest );
> +
> s.open( IO_ReadOnly | IO_Translate );
> d.open( IO_WriteOnly | IO_Truncate | IO_Translate );
> d.writeBlock( s.readAll() );
> @@ -115,6 +143,8 @@
> verbose = true;
> else if ( arg == "dryrun" )
> dryrun = true;
> + else if ( arg == "all" )
> + onlyNew = false;
> else if ( arg == "help" )
> print_help( argv[ 0 ] );
> else {
> @@ -135,9 +165,10 @@
> QStringList noRemove;
> noRemove << "qconfig.h" << "qglobal.h" << "qmodules.h" <<
"qnamespace.h";
>
> - removeHeader( root_prefix + "\\include", "q*.h" , noRemove );
> - removeHeader( root_prefix + "\\include\\private", "q*.h" ,
noRemove );
> -
> + if ( !onlyNew ) {
> + removeHeader( root_prefix + "\\include", "q*.h" , noRemove );
> + removeHeader( root_prefix + "\\include\\private", "q*.h" ,
noRemove );
> + }
> copyHeader( root_prefix + "\\src", include_prefix );
> copyHeader( root_prefix + "\\extensions", include_prefix );
> copyHeader( root_prefix + "\\tools\\designer\\uilib",
include_prefix );
> @@ -145,4 +176,3 @@
>
> return 0;
> }
> -
> Index: misc/link_includes/Makefile.win32-borland
> ===================================================================
> RCS file:
/cvsroot/kde-cygwin/qt-3/misc/link_includes/Attic/Makefile.win32-borland,v
> retrieving revision 1.1.2.2.2.5
> diff -u -r1.1.2.2.2.5 Makefile.win32-borland
> --- misc/link_includes/Makefile.win32-borland 29 Sep 2004 19:45:02 -0000
1.1.2.2.2.5
> +++ misc/link_includes/Makefile.win32-borland 4 Oct 2004 20:06:02 -0000
> @@ -1,9 +1,9 @@
>
############################################################################
#
> # Makefile for building: link_includes
> -# Generated by qmake (1.07a) (Qt 3.1.0) on: Sat Aug 28 01:11:42 2004
> +# Generated by qmake (1.07a) (Qt 3.3.3) on: Mon Oct 04 22:04:28 2004
> # Project: link_includes.pro
> # Template: app
> -# Command: $(QMAKE) -o misc\link_includes\Makefile.win32-borland
misc\link_includes\link_includes.pro
> +# Command: $(QMAKE) -spec win32-borland -o Makefile.win32-borland
link_includes.pro
>
############################################################################
#
>
> !if !$d(BCB)
> @@ -20,7 +20,7 @@
>
CXXFLAGS= -tWR -O2 -tWC -x- -RT- -DUNICODE -DQT_NO_TEXTCODEC -DQT_NO_UNICOD
ETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS
> LEXFLAGS=
> YACCFLAGS=-d
> -INCPATH
= -I"." -I"$(QTDIR)\src\tools" -I"$(QTDIR)\src\kernel" -I"$(QTDIR)\include"
-I"$(QTDIR)\include\private" -I"$(QTDIR)\misc\link_includes" -I"$(QTDIR)\mks
pecs\win32-borland" -I"$(BCB)\include"
> +INCPATH
= -I"$(QTDIR)\src\tools" -I"$(QTDIR)\src\kernel" -I"$(QTDIR)\include" -I"$(Q
TDIR)\include\private" -I"$(QTDIR)\qmake" -I"$(BCB)\include" -I"$(QTDIR)\inc
lude" -I"$(BCB)\include" -I"$(QTDIR)\misc\link_includes" -I"$(QTDIR)\mkspecs
\win32-borland"
> LINK = ilink32
> LFLAGS = -L"$(BCB)\lib" -c -x -Gn -ap -Tpe c0x32.obj
> LIBS = import32.lib cw32i.lib
> @@ -44,8 +44,9 @@
>
> ####### Files
>
> -HEADERS =
> +HEADERS = $(QTDIR)\qmake\qtmd5.h
> SOURCES = link_includes.cpp \
> + $(QTDIR)\qmake\qtmd5.cpp \
> $(QTDIR)\src\tools\qbitarray.cpp \
> $(QTDIR)\src\tools\qbuffer.cpp \
> $(QTDIR)\src\tools\qcstring.cpp \
> @@ -64,6 +65,7 @@
> $(QTDIR)\src\tools\qglobal.cpp \
> $(QTDIR)\src\tools\qgvector.cpp \
> $(QTDIR)\src\tools\qiodevice.cpp \
> + $(QTDIR)\src\tools\qlocale.cpp \
> $(QTDIR)\src\tools\qmap.cpp \
> $(QTDIR)\src\tools\qptrcollection.cpp \
> $(QTDIR)\src\tools\qregexp.cpp \
> @@ -71,6 +73,7 @@
> $(QTDIR)\src\tools\qstringlist.cpp \
> $(QTDIR)\src\tools\qunicodetables.cpp
> OBJECTS = tmp\link_includes.obj \
> + tmp\qtmd5.obj \
> tmp\qbitarray.obj \
> tmp\qbuffer.obj \
> tmp\qcstring.obj \
> @@ -78,7 +81,6 @@
> tmp\qdatetime.obj \
> tmp\qdir.obj \
> tmp\qdir_win.obj \
> - tmp\qdir_win.cpp.obj \
> tmp\qfile.obj \
> tmp\qfile_win.obj \
> tmp\qfileinfo.obj \
> @@ -90,6 +92,7 @@
> tmp\qglobal.obj \
> tmp\qgvector.obj \
> tmp\qiodevice.obj \
> + tmp\qlocale.obj \
> tmp\qmap.obj \
> tmp\qptrcollection.obj \
> tmp\qregexp.obj \
> @@ -102,7 +105,7 @@
> SRCMOC =
> OBJMOC =
> DIST =
> -TARGET = ..\..\bin\link_includes.exe
> +TARGET = $(QTDIR)\bin\link_includes.exe
>
> ####### Implicit rules
>
> @@ -125,7 +128,7 @@
>
> ####### Build rules
>
> -all: $(QTDIR)\misc\link_includes\Makefile.win32-borland $(TARGET)
> +all: Makefile.win32-borland $(TARGET)
>
> $(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
> $(LINK) @&&|
> @@ -136,13 +139,13 @@
> mocables: $(SRCMOC)
> uicables: $(UICIMPLS) $(UICDECLS)
>
> -#$(QTDIR)\misc\link_includes\Makefile.win32-borland: link_includes.pro
$(QTDIR)\.qmake.cache $(QTDIR)\mkspecs\win32-borland\qmake.conf
> -# $(QMAKE) -o $(QTDIR)\misc\link_includes\Makefile.win32-borland
$(QTDIR)\misc\link_includes\link_includes.pro
> +#Makefile.win32-borland: link_includes.pro ..\..\.qmake.cache
$(QTDIR)\mkspecs\win32-borland\qmake.conf
> +# $(QMAKE) -spec win32-borland -o Makefile.win32-borland
link_includes.pro
> #qmake:
> -# @$(QMAKE) -o $(QTDIR)\misc\link_includes\Makefile.win32-borland
$(QTDIR)\misc\link_includes\link_includes.pro
> +# @$(QMAKE) -spec win32-borland -o Makefile.win32-borland
link_includes.pro
>
> dist:
> - $(ZIP) link_includes.zip $(SOURCES) $(HEADERS) $(DIST) $(FORMS)
$(QTDIR)/misc/link_includes/link_includes.pro
> + $(ZIP) link_includes.zip $(SOURCES) $(HEADERS) $(DIST) $(FORMS)
D:/qt-3.3/qt-3.3-msvc/misc/link_includes/link_includes.pro
>
> uiclean:
> @cd .
> @@ -150,6 +153,7 @@
> @cd .
> clean: uiclean mocclean
> -$(DEL_FILE) tmp\link_includes.obj
> + -$(DEL_FILE) tmp\qtmd5.obj
> -$(DEL_FILE) tmp\qbitarray.obj
> -$(DEL_FILE) tmp\qbuffer.obj
> -$(DEL_FILE) tmp\qcstring.obj
> @@ -157,7 +161,6 @@
> -$(DEL_FILE) tmp\qdatetime.obj
> -$(DEL_FILE) tmp\qdir.obj
> -$(DEL_FILE) tmp\qdir_win.obj
> - -$(DEL_FILE) tmp\qdir_win.cpp.obj
> -$(DEL_FILE) tmp\qfile.obj
> -$(DEL_FILE) tmp\qfile_win.obj
> -$(DEL_FILE) tmp\qfileinfo.obj
> @@ -169,15 +172,16 @@
> -$(DEL_FILE) tmp\qglobal.obj
> -$(DEL_FILE) tmp\qgvector.obj
> -$(DEL_FILE) tmp\qiodevice.obj
> + -$(DEL_FILE) tmp\qlocale.obj
> -$(DEL_FILE) tmp\qmap.obj
> -$(DEL_FILE) tmp\qptrcollection.obj
> -$(DEL_FILE) tmp\qregexp.obj
> -$(DEL_FILE) tmp\qstring.obj
> -$(DEL_FILE) tmp\qstringlist.obj
> -$(DEL_FILE) tmp\qunicodetables.obj
> - -$(DEL_FILE) $(QTDIR)\bin\configure.tds
> - -$(DEL_FILE) $(QTDIR)\bin\configure.exe
> - -$(DEL_FILE) ..\..\bin\link_includes.tds
> + -$(DEL_FILE) $(QTDIR)\bin\link_includes.tds
> + -$(DEL_FILE) $(QTDIR)\bin\link_includes.exe
> + -$(DEL_FILE) $(QTDIR)\bin\link_includes.tds
>
>
>
> @@ -189,6 +193,9 @@
> tmp\link_includes.obj: link_includes.cpp
> $(CXX) -c $(CXXFLAGS) $(INCPATH) -otmp\link_includes.obj
link_includes.cpp
>
> +tmp\qtmd5.obj: $(QTDIR)\qmake\qtmd5.cpp $(QTDIR)\qmake\qtmd5.h
> + $(CXX) -c $(CXXFLAGS) $(INCPATH) -otmp\qtmd5.obj
$(QTDIR)\qmake\qtmd5.cpp
> +
> tmp\qbitarray.obj: $(QTDIR)\src\tools\qbitarray.cpp
$(QTDIR)\src\tools\qbitarray.h \
> $(QTDIR)\src\tools\qdatastream.h \
> $(QTDIR)\src\tools\qstring.h \
> @@ -328,6 +335,8 @@
> $(QTDIR)\src\tools\qfileinfo.h \
> $(QTDIR)\src\tools\qregexp.h \
> $(QTDIR)\src\tools\qstringlist.h \
> + $(QTDIR)\src\tools\qmutex.h \
> + $(QTDIR)\src\tools\qmutexpool_p.h \
> $(QTDIR)\src\tools\qglobal.h \
> $(QTDIR)\src\tools\qstrlist.h \
> $(QTDIR)\src\tools\qconfig-minimal.h \
> @@ -353,36 +362,6 @@
> $(QTDIR)\src\tools\qtextstream.h
> $(CXX) -c $(CXXFLAGS) $(INCPATH) -otmp\qdir_win.obj
$(QTDIR)\src\tools\qdir_win.cpp
>
> -tmp\qdir_win.cpp.obj: $(QTDIR)\src\tools\qdir_win.cpp
$(QTDIR)\src\tools\qglobal.h \
> - $(QTDIR)\src\tools\qdir.h \
> - $(QTDIR)\src\tools\qfileinfo.h \
> - $(QTDIR)\src\tools\qfiledefs_p.h \
> - $(QTDIR)\src\tools\qregexp.h \
> - $(QTDIR)\src\tools\qstringlist.h \
> - $(QTDIR)\src\tools\qconfig-minimal.h \
> - $(QTDIR)\src\tools\qconfig-small.h \
> - $(QTDIR)\src\tools\qconfig-medium.h \
> - $(QTDIR)\src\tools\qconfig-large.h \
> - $(QTDIR)\src\tools\qfeatures.h \
> - $(QTDIR)\src\tools\qstrlist.h \
> - $(QTDIR)\src\tools\qstring.h \
> - $(QTDIR)\src\tools\qptrlist.h \
> - $(QTDIR)\src\tools\qdatastream.h \
> - $(QTDIR)\src\tools\qcstring.h \
> - $(QTDIR)\src\tools\qwinexport.h \
> - $(QTDIR)\src\tools\qmemarray.h \
> - $(QTDIR)\src\tools\qgarray.h \
> - $(QTDIR)\src\tools\qshared.h \
> - $(QTDIR)\src\tools\qglist.h \
> - $(QTDIR)\src\tools\qptrcollection.h \
> - $(QTDIR)\src\tools\qiodevice.h \
> - $(QTDIR)\src\tools\qfile.h \
> - $(QTDIR)\src\tools\qdatetime.h \
> - $(QTDIR)\src\tools\qvaluelist.h \
> - $(QTDIR)\src\tools\qtl.h \
> - $(QTDIR)\src\tools\qtextstream.h
> - $(CC) -c $(CFLAGS) $(INCPATH) -otmp\qdir_win.cpp.obj
$(QTDIR)\src\tools\qdir_win.cpp
> -
> tmp\qfile.obj: $(QTDIR)\src\tools\qfile.cpp $(QTDIR)\src\tools\qfile.h \
> $(QTDIR)\src\tools\qiodevice.h \
> $(QTDIR)\src\tools\qstring.h \
> @@ -445,6 +424,7 @@
> $(QTDIR)\src\tools\qdatetime.h \
> $(QTDIR)\src\tools\qdir.h \
> $(QTDIR)\src\tools\qfiledefs_p.h \
> + $(QTDIR)\src\tools\qregexp.h \
> $(QTDIR)\src\tools\qfile.h \
> $(QTDIR)\src\tools\qiodevice.h \
> $(QTDIR)\src\tools\qstring.h \
> @@ -463,7 +443,11 @@
> $(QTDIR)\src\tools\qptrlist.h \
> $(QTDIR)\src\tools\qdatastream.h \
> $(QTDIR)\src\tools\qglist.h \
> - $(QTDIR)\src\tools\qptrcollection.h
> + $(QTDIR)\src\tools\qptrcollection.h \
> + $(QTDIR)\src\tools\qstringlist.h \
> + $(QTDIR)\src\tools\qvaluelist.h \
> + $(QTDIR)\src\tools\qtl.h \
> + $(QTDIR)\src\tools\qtextstream.h
> $(CXX) -c $(CXXFLAGS) $(INCPATH) -otmp\qfileinfo_win.obj
$(QTDIR)\src\tools\qfileinfo_win.cpp
>
> tmp\qgarray.obj: $(QTDIR)\src\tools\qgarray.cpp
$(QTDIR)\src\tools\qglobal.h \
> @@ -588,6 +572,23 @@
> $(QTDIR)\src\tools\qshared.h
> $(CXX) -c $(CXXFLAGS) $(INCPATH) -otmp\qiodevice.obj
$(QTDIR)\src\tools\qiodevice.cpp
>
> +tmp\qlocale.obj: $(QTDIR)\src\tools\qlocale.cpp
$(QTDIR)\src\tools\qlocale.h \
> + $(QTDIR)\src\tools\qlocale_p.h \
> + $(QTDIR)\src\tools\qmutex.h \
> + $(QTDIR)\src\tools\qstring.h \
> + $(QTDIR)\src\tools\qcstring.h \
> + $(QTDIR)\src\tools\qwinexport.h \
> + $(QTDIR)\src\tools\qmemarray.h \
> + $(QTDIR)\src\tools\qgarray.h \
> + $(QTDIR)\src\tools\qshared.h \
> + $(QTDIR)\src\tools\qglobal.h \
> + $(QTDIR)\src\tools\qconfig-minimal.h \
> + $(QTDIR)\src\tools\qconfig-small.h \
> + $(QTDIR)\src\tools\qconfig-medium.h \
> + $(QTDIR)\src\tools\qconfig-large.h \
> + $(QTDIR)\src\tools\qfeatures.h
> + $(CXX) -c $(CXXFLAGS) $(INCPATH) -otmp\qlocale.obj
$(QTDIR)\src\tools\qlocale.cpp
> +
> tmp\qmap.obj: $(QTDIR)\src\tools\qmap.cpp $(QTDIR)\src\tools\qmap.h \
> $(QTDIR)\src\tools\qglobal.h \
> $(QTDIR)\src\tools\qshared.h \
> Index: misc/link_includes/Makefile.win32-g++
> ===================================================================
> RCS file:
/cvsroot/kde-cygwin/qt-3/misc/link_includes/Attic/Makefile.win32-g++,v
> retrieving revision 1.1.2.3.2.3
> diff -u -r1.1.2.3.2.3 Makefile.win32-g++
> --- misc/link_includes/Makefile.win32-g++ 28 Sep 2004 12:26:35 -0000
1.1.2.3.2.3
> +++ misc/link_includes/Makefile.win32-g++ 4 Oct 2004 20:05:54 -0000
> @@ -1,12 +1,9 @@
>
############################################################################
#
> # Makefile for building: link_includes
> -# Generated by qmake (1.07a) (Qt 3.3.2) on: Fri Jul 23 18:53:32 2004
> +# Generated by qmake (1.07a) (Qt 3.3.3) on: Mon Oct 04 22:04:40 2004
> # Project: link_includes.pro
> # Template: app
> -# Command: $(QMAKE) -o Makefile.win32-g++ link_includes.pro
> -#
> -# edited by Christian Ehrlicher: absolute Paths -> ${QTDIR}
> -# remove ..\..\.qmake.cache
> +# Command: $(QMAKE) -spec win32-g++ -o Makefile.win32-g++
link_includes.pro
>
############################################################################
#
>
> ####### Compiler, tools and options
> @@ -19,13 +16,13 @@
> CXXFLAGS
= -O2 -fno-exceptions -fno-rtti -DUNICODE -DQT_NO_TEXTCODEC -DQT_NO_UNICODE
TABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS
> LEXFLAGS =
> YACCFLAGS =-d
> -INCPATH
= -I"." -I"${QTDIR}\src\tools" -I"${QTDIR}\src\kernel" -I"${QTDIR}\include"
-I"${QTDIR}\include\private" -I"${QTDIR}\misc\link_includes" -I"${QTDIR}\mks
pecs\win32-g++"
> +INCPATH
= -I"$(QTDIR)\src\tools" -I"$(QTDIR)\src\kernel" -I"$(QTDIR)\include" -I"$(Q
TDIR)\include\private" -I"$(QTDIR)\qmake" -I"$(QTDIR)\misc\link_includes" -I
"$(QTDIR)\mkspecs\win32-g++"
> LINK = g++
> LFLAGS
= -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseu
do-reloc -Wl,-s -Wl,-subsystem,console
> LIBS = -lole32
> -MOC = ${QTDIR}\bin\moc.exe
> -UIC = ${QTDIR}\bin\uic.exe -L ${QTDIR}\plugins
> -QMAKE = ${QTDIR}\bin\qmake.exe
> +MOC = $(QTDIR)\bin\moc.exe
> +UIC = $(QTDIR)\bin\uic.exe -L $(QTDIR)\plugins
> +QMAKE = $(QTDIR)\bin\qmake.exe
> IDC = $(QTDIR)\bin\idc.exe
> IDL = midl
> ZIP = zip -r -9
> @@ -47,8 +44,9 @@
>
> ####### Files
>
> -HEADERS =
> +HEADERS = $(QTDIR)\qmake\qtmd5.h
> SOURCES = link_includes.cpp \
> + $(QTDIR)\qmake\qtmd5.cpp \
> $(QTDIR)\src\tools\qbitarray.cpp \
> $(QTDIR)\src\tools\qbuffer.cpp \
> $(QTDIR)\src\tools\qcstring.cpp \
> @@ -75,6 +73,7 @@
> $(QTDIR)\src\tools\qstringlist.cpp \
> $(QTDIR)\src\tools\qunicodetables.cpp
> OBJECTS = tmp\link_includes.o \
> + tmp\qtmd5.o \
> tmp\qbitarray.o \
> tmp\qbuffer.o \
> tmp\qcstring.o \
> @@ -106,7 +105,7 @@
> SRCMOC =
> OBJMOC =
> DIST =
> -TARGET = ${QTDIR}\bin\link_includes.exe
> +TARGET = $(QTDIR)\bin\link_includes.exe
>
> ####### Implicit rules
>
> @@ -121,9 +120,6 @@
> .cc.o:
> $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
>
> -.C.o:
> - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
> -
> .c.o:
> $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
>
> @@ -142,15 +138,17 @@
> $(MOC_DIR):
> @if not exist $(MOC_DIR) $(MKDIR) $(MOC_DIR)
>
> -Makefile.win32-g++: link_includes.pro
$(QTDIR)\mkspecs\win32-g++\qmake.conf
> -
> -qmake:
> +#Makefile.win32-g++: link_includes.pro ..\..\.qmake.cache
$(QTDIR)\mkspecs\win32-g++\qmake.conf
> +# $(QMAKE) -spec win32-g++ -o Makefile.win32-g++ link_includes.pro
> +#qmake:
> +# @$(QMAKE) -spec win32-g++ -o Makefile.win32-g++ link_includes.pro
>
> dist:
> $(ZIP) .zip .pro $(SOURCES) $(HEADERS) $(DIST) $(FORMS)
>
> clean:
> -$(DEL_FILE) tmp\link_includes.o
> + -$(DEL_FILE) tmp\qtmd5.o
> -$(DEL_FILE) tmp\qbitarray.o
> -$(DEL_FILE) tmp\qbuffer.o
> -$(DEL_FILE) tmp\qcstring.o
> @@ -184,6 +182,9 @@
> tmp\link_includes.o: link_includes.cpp
> $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tmp\link_includes.o
link_includes.cpp
>
> +tmp\qtmd5.o: $(QTDIR)\qmake\qtmd5.cpp $(QTDIR)\qmake\qtmd5.h
> + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tmp\qtmd5.o $(QTDIR)\qmake\qtmd5.cpp
> +
> tmp\qbitarray.o: $(QTDIR)\src\tools\qbitarray.cpp
$(QTDIR)\src\tools\qbitarray.h \
> $(QTDIR)\src\tools\qdatastream.h \
> $(QTDIR)\src\tools\qstring.h \
> @@ -323,6 +324,8 @@
> $(QTDIR)\src\tools\qfileinfo.h \
> $(QTDIR)\src\tools\qregexp.h \
> $(QTDIR)\src\tools\qstringlist.h \
> + $(QTDIR)\src\tools\qmutex.h \
> + $(QTDIR)\src\tools\qmutexpool_p.h \
> $(QTDIR)\src\tools\qglobal.h \
> $(QTDIR)\src\tools\qstrlist.h \
> $(QTDIR)\src\tools\qconfig-minimal.h \
> @@ -410,6 +413,7 @@
> $(QTDIR)\src\tools\qdatetime.h \
> $(QTDIR)\src\tools\qdir.h \
> $(QTDIR)\src\tools\qfiledefs_p.h \
> + $(QTDIR)\src\tools\qregexp.h \
> $(QTDIR)\src\tools\qfile.h \
> $(QTDIR)\src\tools\qiodevice.h \
> $(QTDIR)\src\tools\qstring.h \
> @@ -428,7 +432,11 @@
> $(QTDIR)\src\tools\qptrlist.h \
> $(QTDIR)\src\tools\qdatastream.h \
> $(QTDIR)\src\tools\qglist.h \
> - $(QTDIR)\src\tools\qptrcollection.h
> + $(QTDIR)\src\tools\qptrcollection.h \
> + $(QTDIR)\src\tools\qstringlist.h \
> + $(QTDIR)\src\tools\qvaluelist.h \
> + $(QTDIR)\src\tools\qtl.h \
> + $(QTDIR)\src\tools\qtextstream.h
> $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tmp\qfileinfo_win.o
$(QTDIR)\src\tools\qfileinfo_win.cpp
>
> tmp\qgarray.o: $(QTDIR)\src\tools\qgarray.cpp
$(QTDIR)\src\tools\qglobal.h \
> Index: misc/link_includes/Makefile.win32-msvc
> ===================================================================
> RCS file:
/cvsroot/kde-cygwin/qt-3/misc/link_includes/Attic/Makefile.win32-msvc,v
> retrieving revision 1.1.2.3.2.5
> diff -u -r1.1.2.3.2.5 Makefile.win32-msvc
> --- misc/link_includes/Makefile.win32-msvc 28 Sep 2004 12:26:35 -0000
1.1.2.3.2.5
> +++ misc/link_includes/Makefile.win32-msvc 4 Oct 2004 20:06:12 -0000
> @@ -1,9 +1,9 @@
>
############################################################################
#
> # Makefile for building: link_includes
> -# Generated by qmake (1.07a) (Qt 3.1.0) on: Sat Aug 28 18:14:55 2004
> +# Generated by qmake (1.07a) (Qt 3.3.3) on: Mon Oct 04 22:03:34 2004
> # Project: link_includes.pro
> # Template: app
> -# Command: $(QMAKE) -o Makefile.win32-msvc link_includes.pro
> +# Command: $(QMAKE) -spec win32-msvc -o Makefile.win32-msvc
link_includes.pro
>
############################################################################
#
>
> ####### Compiler, tools and options
> @@ -12,11 +12,11 @@
> CXX = cl
> LEX = flex
> YACC = byacc
> -CFLAGS
= -nologo -Zm200 -O1 -DUNICODE -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT
_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS
> -CXXFLAGS
= -nologo -Zm200 -O1 -DUNICODE -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT
_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS
> +CFLAGS
= -nologo -Zm200 -EHsc -O1 -DUNICODE -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLE
S -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS
> +CXXFLAGS
= -nologo -Zm200 -EHsc -O1 -DUNICODE -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLE
S -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS
> LEXFLAGS =
> YACCFLAGS =-d
> -INCPATH
= -I"." -I"$(QTDIR)\src\tools" -I"$(QTDIR)\src\kernel" -I"$(QTDIR)\include"
-I"$(QTDIR)\include\private" -I"$(QTDIR)\misc\link_includes" -I"$(QTDIR)\mks
pecs\win32-msvc"
> +INCPATH
= -I"$(QTDIR)\src\tools" -I"$(QTDIR)\src\kernel" -I"$(QTDIR)\include" -I"$(Q
TDIR)\include\private" -I"$(QTDIR)\qmake" -I"$(QTDIR)\misc\link_includes" -I
"$(QTDIR)\mkspecs\win32-msvc"
> LINK = link
> LFLAGS = /NOLOGO delayimp.lib /DELAYLOAD:comdlg32.dll
/DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll
/DELAYLOAD:winspool.dll /SUBSYSTEM:console /incremental:no
> LIBS = "ole32.lib"
> @@ -38,8 +38,9 @@
>
> ####### Files
>
> -HEADERS =
> +HEADERS = $(QTDIR)\qmake\qtmd5.h
> SOURCES = link_includes.cpp \
> + $(QTDIR)\qmake\qtmd5.cpp \
> $(QTDIR)\src\tools\qbitarray.cpp \
> $(QTDIR)\src\tools\qbuffer.cpp \
> $(QTDIR)\src\tools\qcstring.cpp \
> @@ -66,6 +67,7 @@
> $(QTDIR)\src\tools\qstringlist.cpp \
> $(QTDIR)\src\tools\qunicodetables.cpp
> OBJECTS = tmp\link_includes.obj \
> + tmp\qtmd5.obj \
> tmp\qbitarray.obj \
> tmp\qbuffer.obj \
> tmp\qcstring.obj \
> @@ -103,6 +105,31 @@
>
> .SUFFIXES: .c .cpp .cc .cxx .C
>
> +{$(QTDIR)\qmake}.cpp{tmp\}.obj::
> + $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fotmp\ @<<
> + $<
> +<<
> +
> +{$(QTDIR)\qmake}.cc{tmp\}.obj::
> + $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fotmp\ @<<
> + $<
> +<<
> +
> +{$(QTDIR)\qmake}.cxx{tmp\}.obj::
> + $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fotmp\ @<<
> + $<
> +<<
> +
> +{$(QTDIR)\qmake}.C{tmp\}.obj::
> + $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fotmp\ @<<
> + $<
> +<<
> +
> +{$(QTDIR)\qmake}.c{tmp\}.obj::
> + $(CC) -c $(CFLAGS) $(INCPATH) -Fotmp\ @<<
> + $<
> +<<
> +
> {tmp\moc\release-shared-mt}.cpp{tmp\}.obj::
> $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fotmp\ @<<
> $<
> @@ -191,17 +218,19 @@
> mocables: $(SRCMOC)
> uicables: $(UICIMPLS) $(UICDECLS)
>
> -Makefile.win32-msvc: link_includes.pro
$(QTDIR)\mkspecs\win32-msvc\qmake.conf
> -
> -qmake:
> +#Makefile.win32-msvc: link_includes.pro ..\..\.qmake.cache
$(QTDIR)\mkspecs\win32-msvc\qmake.conf
> +# $(QMAKE) -spec win32-msvc -o Makefile.win32-msvc link_includes.pro
> +#qmake:
> +# @$(QMAKE) -spec win32-msvc -o Makefile.win32-msvc link_includes.pro
>
> dist:
> - $(ZIP) link_includes.zip $(SOURCES) $(HEADERS) $(DIST) $(FORMS)
$(QTDIR)/misc/link_includes/link_includes.pro
> + $(ZIP) link_includes.zip $(SOURCES) $(HEADERS) $(DIST) $(FORMS)
D:/qt-3.3/qt-3.3-msvc/misc/link_includes/link_includes.pro
>
> uiclean:
> mocclean:
> clean: uiclean mocclean
> -$(DEL_FILE) tmp\link_includes.obj
> + -$(DEL_FILE) tmp\qtmd5.obj
> -$(DEL_FILE) tmp\qbitarray.obj
> -$(DEL_FILE) tmp\qbuffer.obj
> -$(DEL_FILE) tmp\qcstring.obj
> @@ -228,8 +257,8 @@
> -$(DEL_FILE) tmp\qstringlist.obj
> -$(DEL_FILE) tmp\qunicodetables.obj
> -$(DEL_FILE) vc60.pdb
> - -$(DEL_FILE) configure.pdb
> - -$(DEL_FILE) configure.ilk
> + -$(DEL_FILE) link_includes.pdb
> + -$(DEL_FILE) link_includes.ilk
> -$(DEL_FILE) $(QTDIR)\bin\link_includes.exe
>
>
> @@ -245,6 +274,10 @@
> tmp\link_includes.obj: link_includes.cpp \
>
>
> +tmp\qtmd5.obj: $(QTDIR)\qmake\qtmd5.cpp \
> + $(QTDIR)\qmake\qtmd5.h \
> +
> +
> tmp\qbitarray.obj: $(QTDIR)\src\tools\qbitarray.cpp \
> $(QTDIR)\src\tools\qbitarray.h \
> $(QTDIR)\src\tools\qdatastream.h \
> @@ -391,6 +424,8 @@
> $(QTDIR)\src\tools\qfileinfo.h \
> $(QTDIR)\src\tools\qregexp.h \
> $(QTDIR)\src\tools\qstringlist.h \
> + $(QTDIR)\src\tools\qmutex.h \
> + $(QTDIR)\src\tools\qmutexpool_p.h \
> $(QTDIR)\src\tools\qglobal.h \
> $(QTDIR)\src\tools\qstrlist.h \
> $(QTDIR)\src\tools\qconfig-minimal.h \
> @@ -482,6 +517,7 @@
> $(QTDIR)\src\tools\qdatetime.h \
> $(QTDIR)\src\tools\qdir.h \
> $(QTDIR)\src\tools\qfiledefs_p.h \
> + $(QTDIR)\src\tools\qregexp.h \
> $(QTDIR)\src\tools\qfile.h \
> $(QTDIR)\src\tools\qiodevice.h \
> $(QTDIR)\src\tools\qstring.h \
> @@ -501,6 +537,10 @@
> $(QTDIR)\src\tools\qdatastream.h \
> $(QTDIR)\src\tools\qglist.h \
> $(QTDIR)\src\tools\qptrcollection.h \
> + $(QTDIR)\src\tools\qstringlist.h \
> + $(QTDIR)\src\tools\qvaluelist.h \
> + $(QTDIR)\src\tools\qtl.h \
> + $(QTDIR)\src\tools\qtextstream.h \
>
>
> tmp\qgarray.obj: $(QTDIR)\src\tools\qgarray.cpp \
> Index: misc/link_includes/object_ld_script
> ===================================================================
> RCS file:
/cvsroot/kde-cygwin/qt-3/misc/link_includes/Attic/object_ld_script,v
> retrieving revision 1.1.2.1.2.2
> diff -u -r1.1.2.1.2.2 object_ld_script
> --- misc/link_includes/object_ld_script 25 Sep 2004 12:17:37 -0000
1.1.2.1.2.2
> +++ misc/link_includes/object_ld_script 4 Oct 2004 20:04:42 -0000
> @@ -1,28 +1,29 @@
> -INPUT(
> -./tmp\link_includes.o
> -./tmp\qbitarray.o
> -./tmp\qbuffer.o
> -./tmp\qcstring.o
> -./tmp\qdatastream.o
> -./tmp\qdatetime.o
> -./tmp\qdir.o
> -./tmp\qdir_win.o
> -./tmp\qfile.o
> -./tmp\qfile_win.o
> -./tmp\qfileinfo.o
> -./tmp\qfileinfo_win.o
> -./tmp\qgarray.o
> -./tmp\qgcache.o
> -./tmp\qgdict.o
> -./tmp\qglist.o
> -./tmp\qglobal.o
> -./tmp\qgvector.o
> -./tmp\qiodevice.o
> -./tmp\qlocale.o
> -./tmp\qmap.o
> -./tmp\qptrcollection.o
> -./tmp\qregexp.o
> -./tmp\qstring.o
> -./tmp\qstringlist.o
> -./tmp\qunicodetables.o
> -);
> +INPUT(
> +./tmp\link_includes.o
> +./tmp\qtmd5.o
> +./tmp\qbitarray.o
> +./tmp\qbuffer.o
> +./tmp\qcstring.o
> +./tmp\qdatastream.o
> +./tmp\qdatetime.o
> +./tmp\qdir.o
> +./tmp\qdir_win.o
> +./tmp\qfile.o
> +./tmp\qfile_win.o
> +./tmp\qfileinfo.o
> +./tmp\qfileinfo_win.o
> +./tmp\qgarray.o
> +./tmp\qgcache.o
> +./tmp\qgdict.o
> +./tmp\qglist.o
> +./tmp\qglobal.o
> +./tmp\qgvector.o
> +./tmp\qiodevice.o
> +./tmp\qlocale.o
> +./tmp\qmap.o
> +./tmp\qptrcollection.o
> +./tmp\qregexp.o
> +./tmp\qstring.o
> +./tmp\qstringlist.o
> +./tmp\qunicodetables.o
> +);
>
----------------------------------------------------------------------------
----
> Index: src/qtmain.pro
> ===================================================================
> RCS file: /cvsroot/kde-cygwin/qt-3/src/qtmain.pro,v
> retrieving revision 1.1.1.6
> diff -u -r1.1.1.6 qtmain.pro
> --- src/qtmain.pro 25 Sep 2004 14:55:06 -0000 1.1.1.6
> +++ src/qtmain.pro 4 Oct 2004 19:46:56 -0000
> @@ -14,6 +14,6 @@
> INCLUDEPATH += tmp
> }
> win32-borland:INCLUDEPATH += kernel
> -win32-g++:SOURCES += ${QTDIR}/mkspecs/win32-g++/qtcrtentrypoint.cpp
> +win32-g++:SOURCES += $(QTDIR)/mkspecs/win32-g++/qtcrtentrypoint.cpp
>
> !win32-*:!wince-*:error("${QMAKE_FILE} is intended only for Windows!")
>
----------------------------------------------------------------------------
----
> _______________________________________________
> kde-cygwin mailing list
> kde-cygwin at kde.org
> https://mail.kde.org/mailman/listinfo/kde-cygwin
>
More information about the kde-cygwin
mailing list