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

2008-08-26 00:43 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* make_vc.bat
   * make_vcce.bat
   * make_vc.mak
   - make_vcce.mak
     % make_vcce functionality merged into make_vc.
     * make_vcce.bat changed to a stub calling make_vc.bat.
     ; WinCE builds can be triggered using envvars:
       set HB_BUILD_WINCE=yes
       set HB_CC_NAME=vcce
       Please update your environment and test WinCE builds 
       after this change.

   * make_vc.mak
   * contrib/mtpl_vc.mak
     * Changed HB_VISUALC_VER default to 80.
       It was 60 for non-WinCE builds and contribs, 
       80 for WinCE builds. Now it is 80 for all 
       these cases.

   * make_b32.mak
     * Minor comment visual sync with make_vc.mak.
This commit is contained in:
Viktor Szakats
2008-08-25 22:49:32 +00:00
parent dc77fb782d
commit 4e4a523edf
7 changed files with 151 additions and 1125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
harbour/ChangeLog
View File

@@ -8,6 +8,29 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-08-26 00:43 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* make_vc.bat
* make_vcce.bat
* make_vc.mak
- make_vcce.mak
% make_vcce functionality merged into make_vc.
* make_vcce.bat changed to a stub calling make_vc.bat.
; WinCE builds can be triggered using envvars:
set HB_BUILD_WINCE=yes
set HB_CC_NAME=vcce
Please update your environment and test WinCE builds
after this change.
* make_vc.mak
* contrib/mtpl_vc.mak
* Changed HB_VISUALC_VER default to 80.
It was 60 for non-WinCE builds and contribs,
80 for WinCE builds. Now it is 80 for all
these cases.
* make_b32.mak
* Minor comment visual sync with make_vc.mak.
2008-08-25 23:30 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* doc/cmdline.txt
* doc/hrb_faq.txt

2
harbour/contrib/mtpl_vc.mak
View File

@@ -113,7 +113,7 @@ HB_BUILD_MODE = C
# Visual C++ version
!ifndef HB_VISUALC_VER
HB_VISUALC_VER = 60
HB_VISUALC_VER = 80
!endif
# C Compiler Flags

4
harbour/make_b32.mak
View File

@@ -44,12 +44,12 @@
# HB_BUILD_VERBOSE - enables echoing commands being executed
# HB_REBUILD_PARSER - If set to yes force preprocessing new rules by
# bison (you must use bison 2.3 or later)
# BCCDLL_WITH_DYNRT - If set to -tWR causes that harbour-bc.dll
# will use dynamic runtime library (recommended)
# HB_INSTALL_PREFIX - Path to instalation directory into which
# Harbour will be installed when the command
# "make_bc.bat install" is lauched. Defaults
# to current directory
# BCCDLL_WITH_DYNRT - If set to -tWR causes that harbour-bc.dll
# will use dynamic runtime library (recommended)
#**********************************************************

31
harbour/make_vc.bat
View File

@@ -20,6 +20,7 @@ rem set HB_MAKE_PROGRAM=
rem set HB_SHOW_ERRORS=
rem set HB_MAKE_FLAGS=
rem set HB_CC_NAME=
rem set HB_BUILD_WINCE=yes
rem ---------------------------------------------------------------
set _HB_CC_NAME=%HB_CC_NAME%
@@ -47,6 +48,36 @@ if "%1" == "install" goto INSTALL
if "%1" == "Install" goto INSTALL
if "%1" == "INSTALL" goto INSTALL
rem ---------------------------------------------------------------
if not "%HB_BUILD_WINCE%" == "yes" goto BUILD
rem Checking if HB and HBPP are set
if not "%HB%" == "" if exist %HB% goto CHECK_HBPP
echo.
echo. *******************************************
echo. You must set HB environment variable to a
echo. working copy of Harbour compiler executable
echo. harbour.exe.
echo. Example: set HB=C:\harbour\harbour.exe
echo. *******************************************
echo.
goto EXIT
:CHECK_HBPP
if not "%HBPP%" == "" if exist %HBPP% goto BUILD
echo.
echo. **********************************************
echo. You must set HBPP environment variable to a
echo. working copy of hbpp.exe helper executable
echo. Example: set HBPP=C:\harbour\hbpp.exe
echo. **********************************************
echo.
goto EXIT
rem ---------------------------------------------------------------
:BUILD
%_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log

94
harbour/make_vc.mak
View File

@@ -41,14 +41,17 @@
# HB_BUILD_DLL - If set to yes enables building harbour VM+RTL
# dll in addition to normal static build
# HB_BUILD_MODE - If set to cpp causes to compile in C++ mode
# HB_BUILD_WINCE - If set to yes, a WinCE build will be created.
# HB_BUILD_DEBUG - If set to yes causes to compile with debug info
# HB_BUILD_VERBOSE - enables echoing commands being executed
# HB_REBUILD_PARSER - If set to yes force preprocessing new rules by
# bison (you must use bison 2.3 or later)
# HB_INSTALL_PREFIX - Path to instalation directory into which
# Harbour will be installed when the command
# "make_vc.bat install" is lauched. Defaults
# to current directory
# HB_VISUALC_VER - Version of Visual C++ compiler (defaults to 60).
# Possible values are : 60, 70, 71, 80, 90
# HB_VISUALC_VER - Version of Visual C++ compiler.
# Possible values are : 60, 70, 71, 80 (default), 90
#**********************************************************
@@ -61,19 +64,37 @@ HB_ARCHITECTURE = w32
#**********************************************************
!if "$(HB_GT_LIB)" == ""
!if "$(HB_BUILD_WINCE)" == "yes"
HB_GT_LIB = gtwvt
!else
HB_GT_LIB = gtwin
!endif
!endif
!if "$(HB_GT_DEFAULT)" == ""
!if "$(HB_BUILD_WINCE)" == "yes"
HB_GT_DEFAULT = wvt
!endif
!endif
#**********************************************************
# Visual C++ version
!ifndef HB_VISUALC_VER
HB_VISUALC_VER = 60
HB_VISUALC_VER = 80
!endif
#**********************************************************
!if "$(HB_BUILD_WINCE)" == "yes"
!if $(HB_VISUALC_VER) >= 80
CC = cl.exe
!else
CC = clarm.exe
!endif
!else
CC = cl.exe
!endif
LINKER = link.exe
MKLIB = lib.exe
@@ -117,19 +138,51 @@ HB_BUILD_MODE = C
#**********************************************************
# C Compiler Flags
!if "$(HB_BUILD_WINCE)" == "yes"
!if $(HB_VISUALC_VER) >= 80
CFLAGS_VER = -Od -Os -Gy -GS- -EHsc- -fp:fast -Gm -Zi -GR- -FD -D_CRT_SECURE_NO_DEPRECATE
!else
CFLAGS_VER = -Oxsb1 -EHsc -YX -GF
!endif
CFLAGS = -nologo -W3 -I$(INCLUDE_DIR) -I$(CFLAGS_VER) -T$(HB_BUILD_MODE) \
-D"_WIN32_WCE=0x420" -D"UNDER_CE=0x420" -D"WIN32_PLATFORM_PSPC" \
-D"WINCE" -D"_WINCE" -D"_WINDOWS" -D"ARM" -D"_ARM_" -D"ARMV4" \
-D"POCKETPC2003_UI_MODEL" -D"_M_ARM" -D"UNICODE" -D"_UNICODE" \
$(C_USR) $(CFLAGS) -D_UWIN -I$(OBJ_DIR)
#-----------
!ifndef HB_WINCE_COMPILE_WITH_GTWIN
CFLAGS = $(CFLAGS) -DHB_NO_WIN_CONSOLE
!endif
#-----------
!if "$(HB_BUILD_DEBUG)" == "yes"
CFLAGS = $(CFLAGS) -D "_DEBUG" -D "DEBUG"
DBGMARKER = d
!else
CFLAGS = $(CFLAGS) -D "NDEBUG"
!endif
!else
!if $(HB_VISUALC_VER) >= 80
CFLAGS_VER = -Ot2b1 -EHs-c- -FD -Gs -D_CRT_SECURE_NO_DEPRECATE
!else
CFLAGS_VER = -Ogt2yb1p -GX- -G6 -YX -FD -Gs
!endif
CFLAGS = -I$(INCLUDE_DIR) $(CFLAGS_VER) -T$(HB_BUILD_MODE) \
-W3 -nologo $(C_USR) $(CFLAGS) -I$(OBJ_DIR)
CFLAGS = -nologo -W3 -I$(INCLUDE_DIR) $(CFLAGS_VER) -T$(HB_BUILD_MODE) \
$(C_USR) $(CFLAGS) -I$(OBJ_DIR)
#-----------
!if "$(HB_BUILD_DEBUG)" == "yes"
CFLAGS = -Zi $(CFLAGS)
DBGMARKER = d
!endif
!endif
#-----------
!if "$(HB_BUILD_ST)" != "yes"
CFLAGS = -MT$(DBGMARKER) $(CFLAGS)
@@ -149,31 +202,60 @@ CFLAGS = -D"HB_GT_LIB=$(HB_GT_LIB:gt=)" $(CFLAGS)
CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS)
CLIBFLAGSxxx = $(CLIBFLAGS: -MT= )
CLIBFLAGSxxx = $(CLIBFLAGSxxx: -MTd= )
!if "$(HB_BUILD_WINCE)" == "yes"
CLIBFLAGSDLL = -DHB_DYNLIB $(CLIBFLAGS) $(CLIBFLAGSDLL)
CEXEFLAGSDLL = $(CLIBFLAGS) $(CEXEFLAGSDLL)
!else
CLIBFLAGSDLL = -DHB_DYNLIB -MT$(DBGMARKER) $(CLIBFLAGS) $(CLIBFLAGSDLL)
CEXEFLAGSDLL = -MT$(DBGMARKER) $(CLIBFLAGS) $(CEXEFLAGSDLL)
!endif
#**********************************************************
# Harbour Compiler Flags
HBFLAGSCMN = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km $(PRG_USR)
!if "$(HB_BUILD_WINCE)" == "yes"
HBFLAGSCMN = $(HBFLAGSCMN) -D__PLATFORM__WINCE
!endif
HARBOURFLAGS = -n $(HBFLAGSCMN) $(HARBOURFLAGS)
HARBOURFLAGSDLL= -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL)
#**********************************************************
# Linker Flags
!if "$(HB_BUILD_WINCE)" == "yes"
LDFLAGS = /NOLOGO /SUBSYSTEM:WINDOWSCE,4.20 /MACHINE:ARM /ARMPADCODE \
/STACK:65536,4096 /NODEFAULTLIB:"oldnames.lib" \
/NODEFAULTLIB:"kernel32.lib" /ALIGN:4096 /OPT:REF /OPT:ICF \
/LIBPATH:$(LIB_DIR) $(LDFLAGS)
# /ERRORREPORT:PROMPT /ENTRY:"mainWCRTStartup"
!if $(HB_VISUALC_VER) >= 80
LDFLAGS = $(LDFLAGS) /MANIFEST:NO
!endif
LDFLAGSDLL = /DLL \
/NOLOGO /SUBSYSTEM:WINDOWSCE,4.20 /MACHINE:ARM /ARMPADCODE \
/STACK:65536,4096 /NODEFAULTLIB:"oldnames.lib" \
/LIBPATH:$(LIB_DIR) $(LDFLAGSDLL)
!else
LDFLAGS = /NOLOGO /SUBSYSTEM:console /LIBPATH:$(LIB_DIR) $(LDFLAGS)
LDFLAGSDLL = /NOLOGO /DLL /LIBPATH:$(LIB_DIR) $(LDFLAGSDLL)
LDFLAGSDLL = /DLL \
/NOLOGO /LIBPATH:$(LIB_DIR) $(LDFLAGSDLL)
!endif
!if "$(HB_BUILD_DEBUG)" == "yes"
LDFLAGS = /DEBUG $(LDFLAGS)
LDFLAGSDLL = /DEBUG $(LDFLAGSDLL)
!endif
!if "$(HB_BUILD_WINCE)" == "yes"
STANDARD_SYSLIBS = coredll.lib corelibc.lib winsock.lib ws2.lib
!else
# user32.lib: *Clipboard*(), MessageBox(), CharToOemBuff(), OemToCharBuff(), GetKeyState(), GetKeyboardState(), SetKeyboardState()
# wsock32.lib: hbinet
# advapi32.lib: GetUserName()
# gdi32.lib: gtwvt
STANDARD_SYSLIBS = user32.lib wsock32.lib advapi32.lib gdi32.lib
!endif
#**********************************************************
# COMPILE Rules

110
harbour/make_vcce.bat
View File

@@ -3,109 +3,11 @@ rem
rem $Id$
rem
rem ---------------------------------------------------------------
rem This is a generic template file, if it doesn't fit your own needs
rem please DON'T MODIFY IT.
rem
rem Instead, make a local copy and modify that one, or make a call to
rem this batch file from your customized one. [vszakats]
rem
rem Set any of the below settings to customize your build process:
rem set HB_BUILD_MODE=C
rem set HB_BUILD_DLL=yes
rem set HB_BUILD_DEBUG=yes
rem set HB_BUILD_VERBOSE=yes
rem set HB_REBUILD_PARSER=yes
rem set HB_MAKE_PROGRAM=
rem set HB_SHOW_ERRORS=
rem set HB_MAKE_FLAGS=
rem set HB_CC_NAME=
rem ---------------------------------------------------------------
rem ; This batch file will be removed shortly, please use
rem following method in your build environment to create
rem an MSVC WinCE build.
set _HB_CC_NAME=%HB_CC_NAME%
set _HB_MAKE_PROGRAM=%HB_MAKE_PROGRAM%
set HB_BUILD_WINCE=yes
set HB_CC_NAME=vcce
if "%_HB_CC_NAME%" == "" set _HB_CC_NAME=vcce
if "%_HB_MAKE_PROGRAM%" == "" set _HB_MAKE_PROGRAM=nmake.exe
set _HB_MAKEFILE=make_%_HB_CC_NAME%.mak
set HB_EXIT_LEVEL=
rem ---------------------------------------------------------------
rem Save the user value, force silent file overwrite with COPY
rem (not all Windows versions support the COPY /Y flag)
set HB_ORGENV_COPYCMD=%COPYCMD%
set COPYCMD=/Y
rem ---------------------------------------------------------------
if "%1" == "clean" goto CLEAN
if "%1" == "Clean" goto CLEAN
if "%1" == "CLEAN" goto CLEAN
if "%1" == "install" goto INSTALL
if "%1" == "Install" goto INSTALL
if "%1" == "INSTALL" goto INSTALL
rem ---------------------------------------------------------------
rem Checking if HB and HBPP are set
if not "%HB%" == "" if exist %HB% goto CHECK_HBPP
echo.
echo. *******************************************
echo. You must set HB environment variable to a
echo. working copy of Harbour compiler executable
echo. harbour.exe.
echo. Example: set HB=C:\harbour\harbour.exe
echo. *******************************************
echo.
goto EXIT
:CHECK_HBPP
if not "%HBPP%" == "" if exist %HBPP% goto BUILD
echo.
echo. **********************************************
echo. You must set HBPP environment variable to a
echo. working copy of hbpp.exe helper executable
echo. Example: set HBPP=C:\harbour\hbpp.exe
echo. **********************************************
echo.
goto EXIT
rem ---------------------------------------------------------------
:BUILD
%_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log
if errorlevel 1 set HB_EXIT_LEVEL=1
if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad make_%_HB_CC_NAME%.log
goto EXIT
:CLEAN
%_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log
if errorlevel 1 set HB_EXIT_LEVEL=1
if errorlevel 1 goto EXIT
if exist make_%_HB_CC_NAME%.log del make_%_HB_CC_NAME%.log > nul
if exist inst_%_HB_CC_NAME%.log del inst_%_HB_CC_NAME%.log > nul
goto EXIT
:INSTALL
%_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% INSTALL > nul
if errorlevel 1 set HB_EXIT_LEVEL=1
goto EXIT
:EXIT
rem ---------------------------------------------------------------
rem Restore user value
set COPYCMD=%HB_ORGENV_COPYCMD%
set _HB_CC_NAME=
set _HB_MAKE_PROGRAM=
set _HB_MAKEFILE=
if exist exit_err.bat call exit_err.bat
call make_vc.bat %1 %2 %3

1012
harbour/make_vcce.mak
View File

File diff suppressed because it is too large Load Diff