From 31e675619897453de126cc83db44b93a040bb0b7 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 20 Aug 2010 09:15:14 +0000 Subject: [PATCH] 2010-08-20 11:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * package/mpkg_win_nightly.bat * Change cwd to batch dir. + Added requirements. + Added notes. ! Uses internal svn installation. + Errorlevel handling. * Renamed logs. - Deleted -batch from pscp calls. * package/winuni/mpkg_win_uni.bat * Comment * Changed temp dir to more universal one. * INSTALL + Links to nightly win binaries. --- harbour/ChangeLog | 19 ++++++- harbour/INSTALL | 14 +++-- harbour/package/mpkg_win_nightly.bat | 72 +++++++++++++++++-------- harbour/package/winuni/mpkg_win_uni.bat | 5 +- 4 files changed, 83 insertions(+), 27 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 818f6c92fb..188d919968 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,23 @@ The license applies to all entries newer than 2009-04-28. */ +2010-08-20 11:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * package/mpkg_win_nightly.bat + * Change cwd to batch dir. + + Added requirements. + + Added notes. + ! Uses internal svn installation. + + Errorlevel handling. + * Renamed logs. + - Deleted -batch from pscp calls. + + * package/winuni/mpkg_win_uni.bat + * Comment + * Changed temp dir to more universal one. + + * INSTALL + + Links to nightly win binaries. + 2010-08-19 19:01 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/hbqt_hbqgraphicsrectitem.cpp * contrib/hbqt/qtgui/hbqt_hbqgraphicsrectitem.h @@ -26,7 +43,7 @@ + Advanced: "Page" management and "objects" placement. Page presented is now true to A4 size with margins. Objects placement is achieved to be dropped exactly at the cursor position. - + To play with: try to drag "Rect" node in "Data" tree onto page surface. Use multiple iterations, move at will the rectangles. diff --git a/harbour/INSTALL b/harbour/INSTALL index dcc1edc691..a6c52355d9 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -292,8 +292,10 @@ HARBOUR Unified .7z + .exe installer for Windows ---------------------------------------- - [ To be completed. All required files and scripts reside in package/winuni. - This is a semi-manual process yet. ] + > package\winuni\mpkg_win_uni.bat + + NOTE: Please read instructions in file and do the necessary + steps before calling the script. 4. HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD @@ -1182,7 +1184,13 @@ HARBOUR http://sourceforge.net/projects/harbour-project/files/source/nightly/harbour-nightly.tar.gz/download http://sourceforge.net/projects/harbour-project/files/source/nightly/harbour-nightly.tar.bz2/download - 4.) Harbour source download (stable) + 4.) Harbour nightly binaries (updated once a day from source repository) + + Windows (unified): + https://sourceforge.net/projects/harbour-project/files/binaries-windows/nightly/harbour-nightly-win.exe/download + https://sourceforge.net/projects/harbour-project/files/binaries-windows/nightly/harbour-nightly-win.7z/download + + 5.) Harbour source download (stable) Download source archive from this page and unpack: http://sourceforge.net/project/showfiles.php?group_id=681&package_id=192305 diff --git a/harbour/package/mpkg_win_nightly.bat b/harbour/package/mpkg_win_nightly.bat index f92212c6a6..a5722c123f 100644 --- a/harbour/package/mpkg_win_nightly.bat +++ b/harbour/package/mpkg_win_nightly.bat @@ -9,22 +9,46 @@ rem Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) rem See COPYING for licensing terms. rem --------------------------------------------------------------- +rem --------------------------------------------------------------- +rem REQUIREMENTS FOR BUILD MACHINE: +rem - Online 24/7 +rem - Windows XP or higher +rem - 8GB disk space +rem - downstream internet traffic 100MB per day +rem - upstream internet traffic 100MB per day +rem - 1-5hours CPU time per day +rem - Multicore CPU recommended +rem - admin rights for MSVC setup +rem - admin rights for Scheduled Task setup +rem - Subversion installed +rem +rem NOTES: +rem - The first run under a new (or reinstalled) user account +rem must be done interactively to confirm server identity +rem when doing SCP uploads. +rem --------------------------------------------------------------- + +pushd + +cd %~dp0 + +set _HB_DIR_3RD=%~dp03rd\ +set _HB_DIR_COMP=%~dp0comp\ +set _HB_DIR_TOOL=%~dp0tool\ + echo ! Downloading Harbour sources... if exist harbour rd /q /s harbour -svn export http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour +%_HB_DIR_TOOL%svn\bin\svn export http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour +if errorlevel 1 goto _EXIT +cd harbour echo ! Setting up generic build parameters... -cd harbour - set HB_VF=nightly set HB_VL=%HB_VF% set HB_RT=%~dp0 -set _HB_DIR_3RD=%~dp03rd\ -set _HB_DIR_COMP=%~dp0comp\ -set _HB_DIR_TOOL=%~dp0tool\ set _HB_MAKE_OPTION=HB_VERSION=%HB_VF% set _HB_SFNET_URL=,harbour-project@frs.sourceforge.net:/home/frs/project/h/ha/harbour-project/binaries-windows/nightly/ @@ -56,13 +80,15 @@ echo ! Building Harbour... setlocal echo ! Setting environment for using MinGW GCC set PATH=%_HB_DIR_COMP%mingw\bin -win-make clean install %_HB_MAKE_OPTION% > "%~dp0harbour-nightly-win-mingw.txt" 2>&1 +win-make clean install %_HB_MAKE_OPTION% > "%~dp0harbour-nightly-win-mingw-log.txt" 2>&1 +if errorlevel 1 goto _EXIT endlocal setlocal echo ! Setting environment for using Borland C++ set PATH=%_HB_DIR_COMP%bcc\Bin -win-make clean install %_HB_MAKE_OPTION% > "%~dp0harbour-nightly-win-bcc.txt" 2>&1 +win-make clean install %_HB_MAKE_OPTION% > "%~dp0harbour-nightly-win-bcc-log.txt" 2>&1 +if errorlevel 1 goto _EXIT endlocal rem setlocal @@ -71,17 +97,17 @@ rem SET WATCOM=%_HB_DIR_COMP%watcom rem SET PATH=%WATCOM%\BINNT;%WATCOM%\BINW rem SET EDPATH=%WATCOM%\EDDAT rem SET INCLUDE=%WATCOM%\H;%WATCOM%\H\NT -rem win-make clean install %_HB_MAKE_OPTION% > "%~dp0harbour-nightly-win-watcom.txt" 2>&1 +rem win-make clean install %_HB_MAKE_OPTION% > "%~dp0harbour-nightly-win-watcom-log.txt" 2>&1 rem endlocal rem echo ! Uploading Harbour Windows binaries... rem -rem %_HB_DIR_TOOL%pscp.exe -batch -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-mingw.exe %HB_SFNET_USER%%_HB_SFNET_URL% -rem %_HB_DIR_TOOL%pscp.exe -batch -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-mingw.zip %HB_SFNET_USER%%_HB_SFNET_URL% -rem %_HB_DIR_TOOL%pscp.exe -batch -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-bcc.exe %HB_SFNET_USER%%_HB_SFNET_URL% -rem %_HB_DIR_TOOL%pscp.exe -batch -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-bcc.zip %HB_SFNET_USER%%_HB_SFNET_URL% -rem %_HB_DIR_TOOL%pscp.exe -batch -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-watcom.exe %HB_SFNET_USER%%_HB_SFNET_URL% -rem %_HB_DIR_TOOL%pscp.exe -batch -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-watcom.zip %HB_SFNET_USER%%_HB_SFNET_URL% +rem %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-mingw.exe %HB_SFNET_USER%%_HB_SFNET_URL% +rem %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-mingw.zip %HB_SFNET_USER%%_HB_SFNET_URL% +rem %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-bcc.exe %HB_SFNET_USER%%_HB_SFNET_URL% +rem %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-bcc.zip %HB_SFNET_USER%%_HB_SFNET_URL% +rem %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-watcom.exe %HB_SFNET_USER%%_HB_SFNET_URL% +rem %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% harbour-nightly-win-watcom.zip %HB_SFNET_USER%%_HB_SFNET_URL% echo ! Creating unified Windows package... @@ -89,11 +115,15 @@ call package\winuni\mpkg_win_uni.bat echo ! Uploading Harbour unified Windows package... -%_HB_DIR_TOOL%pscp.exe -batch -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win.exe %HB_SFNET_USER%%_HB_SFNET_URL% -%_HB_DIR_TOOL%pscp.exe -batch -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win.7z %HB_SFNET_USER%%_HB_SFNET_URL% -%_HB_DIR_TOOL%pscp.exe -batch -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win-log.txt %HB_SFNET_USER%%_HB_SFNET_URL% -%_HB_DIR_TOOL%pscp.exe -batch -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win-mingw.txt %HB_SFNET_USER%%_HB_SFNET_URL% -%_HB_DIR_TOOL%pscp.exe -batch -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win-bcc.txt %HB_SFNET_USER%%_HB_SFNET_URL% -rem %_HB_DIR_TOOL%pscp.exe -batch -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win-watcom.txt %HB_SFNET_USER%%_HB_SFNET_URL% +%_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win.exe %HB_SFNET_USER%%_HB_SFNET_URL% +%_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win.7z %HB_SFNET_USER%%_HB_SFNET_URL% +%_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win-log.txt %HB_SFNET_USER%%_HB_SFNET_URL% +%_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win-mingw-log.txt %HB_SFNET_USER%%_HB_SFNET_URL% +%_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win-bcc-log.txt %HB_SFNET_USER%%_HB_SFNET_URL% +rem %_HB_DIR_TOOL%pscp.exe -i %HB_SFNET_FRS_PRIVATE_KEY% %HB_RT%harbour-nightly-win-watcom-log.txt %HB_SFNET_USER%%_HB_SFNET_URL% + +:_EXIT echo ! Finished. + +popd diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index 09ac41866c..011b32be6c 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -4,7 +4,8 @@ @echo off -@rem - Adjust target dir, mingw dirs, set HB_DIR_UPX, HB_DIR_MINGW, create required packages beforehand. +@rem - Adjust target dir, mingw dirs, set HB_DIR_UPX, HB_DIR_7Z, HB_DIR_MINGW, +@rem create required packages beforehand. @rem - Requires BCC in PATH or HB_DIR_BCC_IMPLIB (for implib). @rem - Run this from vanilla official source tree only. @@ -12,7 +13,7 @@ if "%HB_VS%" == "" set HB_VS=21 if "%HB_VL%" == "" set HB_VL=210 if "%HB_VM%" == "" set HB_VM=2.1 if "%HB_VF%" == "" set HB_VF=2.1.0 -if "%HB_RT%" == "" set HB_RT=F:\hb\ +if "%HB_RT%" == "" set HB_RT=C:\hb\ set HB_DR=hb%HB_VS%\ set HB_ABSROOT=%HB_RT%%HB_DR%