fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-01-02 22:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbqt/hbqt.h
    + Will now fail with forced compiler error if used with
      QT libs older than 4.5.0.

  * package/winuni/mpkg_win_uni_extra_copy.bat
    * Formatting.
This commit is contained in:
Viktor Szakats
2010-01-02 21:28:10 +00:00
parent 8c18499355
commit c9692c977b
3 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -17,6 +17,14 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-01-02 22:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/hbqt.h
+ Will now fail with forced compiler error if used with
QT libs older than 4.5.0.
* package/winuni/mpkg_win_uni_extra_copy.bat
* Formatting.
2010-01-02 21:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* config/global.mk
% Applied optimization sent by Tamas Tevesz.

6
harbour/contrib/hbqt/hbqt.h
View File

@@ -59,7 +59,9 @@
#include <qglobal.h>
#if QT_VERSION >= 0x040500
#if !( QT_VERSION >= 0x040500 )
#error QT library version 4.5.0 or upper is required for hbqt.
#endif
#define QT_G_FUNC( hbfunc ) void hbfunc( void * Cargo ) /* callback function for cleaning garbage memory pointer */
typedef QT_G_FUNC( QT_G_FUNC_ );
@@ -400,6 +402,4 @@ extern void * hbqt_pPtrFromObj( int iParam );
extern QT_G_FUNC( hbqt_release_HBDbfModel );
extern void * hbqt_gcAllocate_HBDbfModel( void * pObj );
#endif
#endif /* __HBQT_H */

72
harbour/package/winuni/mpkg_win_uni_extra_copy.bat
View File

@@ -7,50 +7,50 @@
@rem - Adjust target dir, mingw dirs, set HB_DIR_UPX, create required packages beforehand.
@rem - Run this from vanilla official source tree only.
xcopy /y RELNOTES F:\hb\hb20\
xcopy /y /s ..\..\examples\*.* F:\hb\hb20\examples\
xcopy /y /s ..\..\tests\*.* F:\hb\hb20\tests\
xcopy /y ..\..\bin\hb-mkimp.bat F:\hb\hb20\bin\
xcopy /y HARBOUR_README_ADDONS F:\hb\hb20\addons\
xcopy /y HARBOUR_README_DJGPP F:\hb\hb20\comp\djgpp\
xcopy /y HARBOUR_README_MINGW F:\hb\hb20\comp\mingw\
xcopy /y HARBOUR_README_MINGW64 F:\hb\hb20\comp\mingw64\
xcopy /y HARBOUR_README_MINGWARM F:\hb\hb20\comp\mingwarm\
xcopy /y HARBOUR_README_POCC F:\hb\hb20\comp\pocc\
xcopy /y HARBOUR_README_WATCOM F:\hb\hb20\comp\watcom\
xcopy /y RELNOTES F:\hb\hb20\
xcopy /y /s ..\..\examples\*.* F:\hb\hb20\examples\
xcopy /y /s ..\..\tests\*.* F:\hb\hb20\tests\
xcopy /y ..\..\bin\hb-mkimp.bat F:\hb\hb20\bin\
xcopy /y HARBOUR_README_ADDONS F:\hb\hb20\addons\
xcopy /y HARBOUR_README_DJGPP F:\hb\hb20\comp\djgpp\
xcopy /y HARBOUR_README_MINGW F:\hb\hb20\comp\mingw\
xcopy /y HARBOUR_README_MINGW64 F:\hb\hb20\comp\mingw64\
xcopy /y HARBOUR_README_MINGWARM F:\hb\hb20\comp\mingwarm\
xcopy /y HARBOUR_README_POCC F:\hb\hb20\comp\pocc\
xcopy /y HARBOUR_README_WATCOM F:\hb\hb20\comp\watcom\
xcopy /y /s ..\..\contrib\hbide\*.* F:\hb\hb20\contrib\hbide\
xcopy /y /s ..\..\contrib\hbide\*.* F:\hb\hb20\contrib\hbide\
xcopy /y /s ..\..\pkg\win\mingw\harbour-2.0.0-win-mingw F:\hb\hb20\
xcopy /y /s ..\..\pkg\win\mingw\harbour-2.0.0-win-mingw F:\hb\hb20\
xcopy /y /s ..\..\pkg\linux\watcom\harbour-2.0.0-linux-watcom\lib F:\hb\hb20\lib\linux\watcom\
xcopy /y /s ..\..\pkg\dos\watcom\hb200wa\lib F:\hb\hb20\lib\
xcopy /y /s ..\..\pkg\os2\watcom\harbour-2.0.0-os2-watcom\lib F:\hb\hb20\lib\
xcopy /y /s ..\..\pkg\wce\mingwarm\harbour-2.0.0-wce-mingwarm\lib F:\hb\hb20\lib\
xcopy /y /s ..\..\pkg\win\bcc\harbour-2.0.0-win-bcc\lib F:\hb\hb20\lib\
xcopy /y /s ..\..\pkg\win\mingw\harbour-2.0.0-win-mingw\lib F:\hb\hb20\lib\
xcopy /y /s ..\..\pkg\win\mingw64\harbour-2.0.0-win-mingw64\lib F:\hb\hb20\lib\
xcopy /y /s ..\..\pkg\win\msvc\harbour-2.0.0-win-msvc\lib F:\hb\hb20\lib\
xcopy /y /s ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\lib F:\hb\hb20\lib\
xcopy /y /s ..\..\pkg\win\watcom\harbour-2.0.0-win-watcom\lib F:\hb\hb20\lib\
xcopy /y /s ..\..\pkg\linux\watcom\harbour-2.0.0-linux-watcom\lib F:\hb\hb20\lib\linux\watcom\
xcopy /y /s ..\..\pkg\dos\watcom\hb200wa\lib F:\hb\hb20\lib\
xcopy /y /s ..\..\pkg\os2\watcom\harbour-2.0.0-os2-watcom\lib F:\hb\hb20\lib\
xcopy /y /s ..\..\pkg\wce\mingwarm\harbour-2.0.0-wce-mingwarm\lib F:\hb\hb20\lib\
xcopy /y /s ..\..\pkg\win\bcc\harbour-2.0.0-win-bcc\lib F:\hb\hb20\lib\
xcopy /y /s ..\..\pkg\win\mingw\harbour-2.0.0-win-mingw\lib F:\hb\hb20\lib\
xcopy /y /s ..\..\pkg\win\mingw64\harbour-2.0.0-win-mingw64\lib F:\hb\hb20\lib\
xcopy /y /s ..\..\pkg\win\msvc\harbour-2.0.0-win-msvc\lib F:\hb\hb20\lib\
xcopy /y /s ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\lib F:\hb\hb20\lib\
xcopy /y /s ..\..\pkg\win\watcom\harbour-2.0.0-win-watcom\lib F:\hb\hb20\lib\
xcopy /y ..\..\pkg\wce\mingwarm\harbour-2.0.0-wce-mingwarm\bin\*.dll F:\hb\hb20\bin\
xcopy /y ..\..\pkg\win\bcc\harbour-2.0.0-win-bcc\bin\*.dll F:\hb\hb20\bin\
xcopy /y ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\bin\*.dll F:\hb\hb20\bin\
xcopy /y ..\..\pkg\wce\mingwarm\harbour-2.0.0-wce-mingwarm\bin\*.dll F:\hb\hb20\bin\
xcopy /y ..\..\pkg\win\bcc\harbour-2.0.0-win-bcc\bin\*.dll F:\hb\hb20\bin\
xcopy /y ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\bin\*.dll F:\hb\hb20\bin\
rem ; Using msvc64 because mingw64 .dll handling is broken.
copy /y ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\bin\harbour.exe F:\hb\hb20\bin\harbour-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\bin\hbpp.exe F:\hb\hb20\bin\hbpp-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\bin\hbformat-dll.exe F:\hb\hb20\bin\hbformat-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\bin\hbi18n-dll.exe F:\hb\hb20\bin\hbi18n-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\bin\hbmk2-dll.exe F:\hb\hb20\bin\hbmk2-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\bin\hbrun-dll.exe F:\hb\hb20\bin\hbrun-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\bin\hbtest-dll.exe F:\hb\hb20\bin\hbtest-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\bin\harbour.exe F:\hb\hb20\bin\harbour-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\bin\hbpp.exe F:\hb\hb20\bin\hbpp-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\bin\hbformat-dll.exe F:\hb\hb20\bin\hbformat-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\bin\hbi18n-dll.exe F:\hb\hb20\bin\hbi18n-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\bin\hbmk2-dll.exe F:\hb\hb20\bin\hbmk2-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\bin\hbrun-dll.exe F:\hb\hb20\bin\hbrun-x64.exe
copy /y ..\..\pkg\win\msvc64\harbour-2.0.0-win-msvc64\bin\hbtest-dll.exe F:\hb\hb20\bin\hbtest-x64.exe
xcopy /y "%HB_DIR_UPX%upx.exe" F:\hb\hb20\bin\
copy /y "%HB_DIR_UPX%LICENSE" F:\hb\hb20\bin\upx_LICENSE.txt
xcopy /y "%HB_DIR_UPX%upx.exe" F:\hb\hb20\bin\
copy /y "%HB_DIR_UPX%LICENSE" F:\hb\hb20\bin\upx_LICENSE.txt
xcopy /y /s /e F:\devl\MinGW-441-tdm F:\hb\hb20\comp\mingw\
xcopy /y /s /e F:\devl\MinGW-441-tdm F:\hb\hb20\comp\mingw\
del F:\hb\hb20\comp\mingw\tdm-mingw-1.908.0-4.4.1-2.exe
pushd