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

2009-06-25 10:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* INSTALL
  + mpkg_gnu.bat
  - mpkg_dos.bat
  - mpkg_win.bat
    % Windows and DOS package make batches merged into one.
    ! Deleting of BCC junk files where broken after latest changes.

  * make_gnu.bat
    ! Fixed to ignore HB_BUILD_DLL for dos platforms.
This commit is contained in:
Viktor Szakats
2009-06-26 09:00:16 +00:00
parent afd20bf033
commit a570904b7c
5 changed files with 28 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -17,6 +17,17 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-06-25 10:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
+ mpkg_gnu.bat
- mpkg_dos.bat
- mpkg_win.bat
% Windows and DOS package make batches merged into one.
! Deleting of BCC junk files where broken after latest changes.
* make_gnu.bat
! Fixed to ignore HB_BUILD_DLL for dos platforms.
2009-06-25 10:22 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* make_gnu.bat
* Automatically setting dos/wce architecture for some

4
harbour/INSTALL
View File

@@ -518,7 +518,7 @@ EXAMPLES
rem ; To create installation packages (.exe + .zip),
rem replace last line (calling make_gnu.bat) with these two:
set HB_DIR_NSIS=%ProgramFiles%\NSIS\
call mpkg_win.bat
call mpkg_gnu.bat
-->8--
DOS
@@ -560,7 +560,7 @@ EXAMPLES
rem ; To create installation packages (.zip),
rem replace last line (calling make_gnu.bat) with this one:
rem (this will only work when using Windows NT or upper host)
call mpkg_dos.bat
call mpkg_gnu.bat
-->8--
OS/2

1
harbour/make_gnu.bat
View File

@@ -161,6 +161,7 @@ if "%HB_COMPILER%" == "" set HB_COMPILER=djgpp
rem It will automatically build Harbour in two passes, one for
rem the .dlls and a final pass for the regular version.
if "%HB_ARCHITECTURE%" == "dos" goto SKIP_WINDLL
if not "%HB_BUILD_DLL%" == "yes" goto SKIP_WINDLL
if "%HB_COMPILER%%HB_CCPREFIX%" == "mingw64" set HB_CCPREFIX=x86_64-pc-mingw32-

83
harbour/mpkg_dos.bat
View File

@@ -1,83 +0,0 @@
@rem
@rem $Id$
@rem
@echo off
rem ---------------------------------------------------------------
rem Installer creator for Harbour Project
rem
rem Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
rem See COPYING for licensing terms.
rem
rem This script requires:
rem - Windows NT or upper
rem - Info-ZIP zip.exe in PATH
rem https://sourceforge.net/project/showfiles.php?group_id=118012
rem - HB_COMPILER envvar configured (see INSTALL doc)
rem - C compiler and GNU Make configured (see INSTALL doc)
rem ---------------------------------------------------------------
if not "%OS%" == "Windows_NT" echo This Harbour build script requires Windows NT or upper.
if not "%OS%" == "Windows_NT" goto END
setlocal
rem ; Basic setup
set HB_VERSION=2b2
rem ; Dir setup
set HB_INSTALL_BASE=%~dp0_hb_inst
set HB_INSTALL_PREFIX=%HB_INSTALL_BASE%\_pending
set HB_BIN_INSTALL=
set HB_LIB_INSTALL=
set HB_INC_INSTALL=
set HB_DOC_INSTALL=
rem ; Pre-build cleanup
if exist "%HB_INSTALL_PREFIX%" rmdir /q /s "%HB_INSTALL_PREFIX%"
rem ; Option setup
set HB_BUILD_LOG=yes
set HB_BUILD_OPTIM=yes
set HB_BUILD_DEBUG=no
rem ; Build Harbour
call "%~dp0make_gnu.bat" clean install
if errorlevel 1 echo Harbour build returned: %ERRORLEVEL%
rem if errorlevel 1 goto MK_ERROR
rem ; Final name setup
set HB_PKGNAME=hb%HB_VERSION%%HB_COMPILER:~0,2%
set HB_DIRNAME=%HB_PKGNAME%
rem ; Rename temp dir to final name
if exist "%HB_INSTALL_BASE%\%HB_DIRNAME%" rmdir /q /s "%HB_INSTALL_BASE%\%HB_DIRNAME%"
move "%HB_INSTALL_PREFIX%" "%HB_INSTALL_BASE%\%HB_DIRNAME%" > nul
set HB_INSTALL_PREFIX=%HB_INSTALL_BASE%\%HB_DIRNAME%
rem ; Post-build installation
copy /Y ChangeLog* "%HB_INSTALL_PREFIX%\" > nul
copy /Y COPYING "%HB_INSTALL_PREFIX%\" > nul
copy /Y ERRATA "%HB_INSTALL_PREFIX%\" > nul
copy /Y INSTALL "%HB_INSTALL_PREFIX%\" > nul
copy /Y TODO "%HB_INSTALL_PREFIX%\" > nul
rem ; Build .zip package
echo Harbour .zip install package creation: '%HB_PKGNAME%.zip'
if exist "%HB_PKGNAME%.zip" del "%HB_PKGNAME%.zip"
pushd
cd "%HB_INSTALL_BASE%"
zip -q -9 -X -r -o "%~dp0%HB_PKGNAME%.zip" . -i "%HB_DIRNAME%\*"
popd
:MK_ERROR
rem ; Cleanup
if "%1" == "--deltemp" rmdir /q /s "%HB_INSTALL_PREFIX%"
if "%1" == "--deltemp" rmdir /q "%HB_INSTALL_BASE%"
endlocal
:END

25
harbour/mpkg_win.bat → harbour/mpkg_gnu.bat
View File

@@ -14,8 +14,10 @@ rem This script requires:
rem - Windows NT or upper
rem - NullSoft Installer installed (NSIS)
rem https://sourceforge.net/project/showfiles.php?group_id=22049&package_id=15374
rem (only for Windows builds)
rem - makensis.exe (part of NSIS) in PATH
rem or HB_DIR_NSIS envvar set to its dir with an ending backslash.
rem (only for Windows builds)
rem - Info-ZIP zip.exe in PATH
rem https://sourceforge.net/project/showfiles.php?group_id=118012
rem - HB_COMPILER envvar configured (see INSTALL doc)
@@ -27,9 +29,6 @@ if not "%OS%" == "Windows_NT" goto END
setlocal
rem ; Basic setup
set HB_VERSION=2.0.0beta2
rem ; Dir setup
set HB_INSTALL_BASE=%~dp0_hb_inst
set HB_INSTALL_PREFIX=%HB_INSTALL_BASE%\_pending
@@ -49,14 +48,18 @@ set HB_BUILD_DEBUG=no
set HB_BUILD_IMPLIB=no
rem ; Build Harbour
call "%~dp0make_gnu.bat"
call "%~dp0make_gnu.bat" clean install
if errorlevel 1 echo Harbour build returned: %ERRORLEVEL%
rem if errorlevel 1 goto MK_ERROR
rem ; Final name setup
set HB_PKGNAME=harbour-%HB_VERSION%-%HB_ARCHITECTURE%-%HB_COMPILER%
set HB_DIRNAME=harbour-%HB_ARCHITECTURE%-%HB_COMPILER%
if "%HB_ARCHITECTURE" == "dos" set HB_VERSION=2b2
if "%HB_ARCHITECTURE" == "dos" set HB_PKGNAME=hb%HB_VERSION%%HB_COMPILER:~0,2%
if "%HB_ARCHITECTURE" == "dos" set HB_DIRNAME=%HB_PKGNAME%
if not "%HB_ARCHITECTURE" == "dos" set HB_VERSION=2.0.0beta2
if not "%HB_ARCHITECTURE" == "dos" set HB_PKGNAME=harbour-%HB_VERSION%-%HB_ARCHITECTURE%-%HB_COMPILER%
if not "%HB_ARCHITECTURE" == "dos" set HB_DIRNAME=harbour-%HB_ARCHITECTURE%-%HB_COMPILER%
rem ; Rename temp dir to final name
if exist "%HB_INSTALL_BASE%\%HB_DIRNAME%" rmdir /q /s "%HB_INSTALL_BASE%\%HB_DIRNAME%"
@@ -64,9 +67,9 @@ move "%HB_INSTALL_PREFIX%" "%HB_INSTALL_BASE%\%HB_DIRNAME%" > nul
set HB_INSTALL_PREFIX=%HB_INSTALL_BASE%\%HB_DIRNAME%
rem ; Post-build cleanup
if exist "%HB_BIN_INSTALL%\*.tds" del "%HB_BIN_INSTALL%\*.tds"
if exist "%HB_BIN_INSTALL%\*.lib" del "%HB_BIN_INSTALL%\*.lib"
if exist "%HB_BIN_INSTALL%\*.exp" del "%HB_BIN_INSTALL%\*.exp"
if exist "%HB_INSTALL_PREFIX%\bin\*.tds" del "%HB_INSTALL_PREFIX%\bin\*.tds"
if exist "%HB_INSTALL_PREFIX%\bin\*.lib" del "%HB_INSTALL_PREFIX%\bin\*.lib"
if exist "%HB_INSTALL_PREFIX%\bin\*.exp" del "%HB_INSTALL_PREFIX%\bin\*.exp"
rem ; Post-build installation
copy /Y ChangeLog* "%HB_INSTALL_PREFIX%\" > nul
@@ -84,8 +87,8 @@ zip -q -9 -X -r -o "%~dp0%HB_PKGNAME%.zip" . -i "%HB_DIRNAME%\*"
popd
rem ; Build installer package
echo Harbour .exe install package creation: '%HB_PKGNAME%.exe'
"%HB_DIR_NSIS%makensis.exe" /V2 "%~dp0mpkg_win.nsi"
if not "%HB_ARCHITECTURE" == "dos" echo Harbour .exe install package creation: '%HB_PKGNAME%.exe'
if not "%HB_ARCHITECTURE" == "dos" "%HB_DIR_NSIS%makensis.exe" /V2 "%~dp0mpkg_win.nsi"
:MK_ERROR