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

2008-06-05 18:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* common.mak
   * harbour-ce-spec
   * harbour-w32-spec
   * harbour.spec
   * make_b32.mak
   * make_gcc.mak
   * make_vc.mak
   * make_vcce.bat
   * make_vcce.mak
   * make_xmingw.sh
   * make_xmingwce.sh
   + source/pp/hbpp.c
   - source/pp/hbppgen.c
   * source/pp/Makefile
     * hbppgen -> hbpp
     ; Please test.

   * harbour-w32-spec
     ! Added 'svn:keywords "Author Date Id Revision"'
     ; TOMERGE [RC1]
This commit is contained in:
Viktor Szakats
2008-06-05 16:33:37 +00:00
parent ee30ae86ac
commit c5ac234016
14 changed files with 78 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
harbour/ChangeLog
View File

@@ -8,6 +8,28 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-06-05 18:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* common.mak
* harbour-ce-spec
* harbour-w32-spec
* harbour.spec
* make_b32.mak
* make_gcc.mak
* make_vc.mak
* make_vcce.bat
* make_vcce.mak
* make_xmingw.sh
* make_xmingwce.sh
+ source/pp/hbpp.c
- source/pp/hbppgen.c
* source/pp/Makefile
* hbppgen -> hbpp
; Please test.
* harbour-w32-spec
! Added 'svn:keywords "Author Date Id Revision"'
; TOMERGE [RC1]
2008-06-05 14:58 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/harbour-ce-spec
* harbour/harbour-w32-spec

12
harbour/common.mak
View File

@@ -248,7 +248,7 @@ GTXWC_LIB = $(LIB_DIR)\$(LIBPREF)gtxwc$(LIBEXT)
HARBOUR_EXE = $(BIN_DIR)\harbour$(EXEEXT)
# required (intermediate) utility
# to generate pptable.c
HBPPGEN_EXE = $(BIN_DIR)\hbppgen$(EXEEXT)
HBPP_EXE = $(BIN_DIR)\hbpp$(EXEEXT)
HBPPTEST_EXE = $(BIN_DIR)\hbpptest$(EXEEXT)
HBRUN_EXE = $(BIN_DIR)\hbrun$(EXEEXT)
HBDOT_EXE = $(BIN_DIR)\hbdot$(EXEEXT)
@@ -1036,8 +1036,8 @@ HARBOUR_EXE_OBJS = \
#**********************************************************
HBPPGEN_EXE_OBJS = \
$(OBJ_DIR)\hbppgen$(OBJEXT) \
HBPP_EXE_OBJS = \
$(OBJ_DIR)\hbpp$(OBJEXT) \
#**********************************************************
@@ -1182,7 +1182,7 @@ DISABLED_SHARED_MODULES= \
HB_BUILD_TARGETS = \
$(COMMON_LIB) \
$(HBPPGEN_EXE) \
$(HBPP_EXE) \
$(PP_LIB) \
\
$(COMPILER_LIB) \
@@ -1231,8 +1231,8 @@ HB = $(HARBOUR_EXE)
!endif
# allows to do cross-compiling if neccesary.
!ifndef HBPPGEN
HBPPGEN = $(HBPPGEN_EXE)
!ifndef HBPP
HBPP = $(HBPP_EXE)
!endif
#**********************************************************

4
harbour/harbour-ce-spec
View File

@@ -97,7 +97,7 @@ export HB_ARCHITECTURE=w32
export HB_COMPILER=cemgw
mkdir -p source/pp/${HB_ARCHITECTURE}/${HB_COMPILER}
ln -s ../../linux/gcc/hbppgen source/pp/${HB_ARCHITECTURE}/${HB_COMPILER}/hbppgen.exe
ln -s ../../linux/gcc/hbpp source/pp/${HB_ARCHITECTURE}/${HB_COMPILER}/hbpp.exe
mkdir -p source/main/${HB_ARCHITECTURE}/${HB_COMPILER}
ln -s ../../linux/gcc/harbour source/main/${HB_ARCHITECTURE}/${HB_COMPILER}/harbour.exe
@@ -172,7 +172,7 @@ make -r -i install
${CCPREFIX}strip --strip-debug $HB_LIB_INSTALL/*
# remove unused files
rm -fR ${HB_BIN_INSTALL}/{harbour,hbppgen,hbdoc,hbdot,hbmake,hbrun,hbtest,hbverfix,hbpptest}.exe
rm -fR ${HB_BIN_INSTALL}/{harbour,hbpp,hbdoc,hbdot,hbmake,hbrun,hbtest,hbverfix,hbpptest}.exe
rm -fR $HB_INC_INSTALL
# Create a README file for people using this RPM.

4
harbour/harbour-w32-spec
View File

@@ -97,7 +97,7 @@ export HB_ARCHITECTURE=w32
export HB_COMPILER=mingw32
mkdir -p source/pp/${HB_ARCHITECTURE}/${HB_COMPILER}
ln -s ../../linux/gcc/hbppgen source/pp/${HB_ARCHITECTURE}/${HB_COMPILER}/hbppgen.exe
ln -s ../../linux/gcc/hbpp source/pp/${HB_ARCHITECTURE}/${HB_COMPILER}/hbpp.exe
mkdir -p source/main/${HB_ARCHITECTURE}/${HB_COMPILER}
ln -s ../../linux/gcc/harbour source/main/${HB_ARCHITECTURE}/${HB_COMPILER}/harbour.exe
@@ -172,7 +172,7 @@ make -r -i install
${CCPREFIX}strip --strip-debug $HB_LIB_INSTALL/*
# remove unused files
rm -fR ${HB_BIN_INSTALL}/{harbour,hbppgen,hbdoc,hbdot,hbmake,hbrun,hbtest,hbverfix,hbpptest}.exe
rm -fR ${HB_BIN_INSTALL}/{harbour,hbpp,hbdoc,hbdot,hbmake,hbrun,hbtest,hbverfix,hbpptest}.exe
rm -fR $HB_INC_INSTALL
# Create a README file for people using this RPM.

2
harbour/harbour.spec
View File

@@ -492,7 +492,7 @@ rm -rf $RPM_BUILD_ROOT
%verify(not md5 mtime) %config /etc/harbour.cfg
%verify(not md5 mtime) %config /etc/harbour/hb-charmap.def
%{_bindir}/harbour
%{_bindir}/hbppgen
%{_bindir}/hbpp
%{_bindir}/hb-mkslib
%{_bindir}/%{hb_pref}-build
%{_bindir}/%{hb_pref}cc

20
harbour/make_b32.mak
View File

@@ -455,14 +455,14 @@ $(COMMON_LIB)
$(PP_LIB)
!
#**********************************************************
# HBPPGEN build rule
# HBPP build rule
#**********************************************************
$(HBPPGEN_EXE) :: $(COMMON_LIB)
$(HBPPGEN_EXE) :: $(HBPPGEN_EXE_OBJS)
IF EXIST "$(HBPPGEN_EXE)" $(DEL) "$(HBPPGEN_EXE)" > NUL
$(HBPP_EXE) :: $(COMMON_LIB)
$(HBPP_EXE) :: $(HBPP_EXE_OBJS)
IF EXIST "$(HBPP_EXE)" $(DEL) "$(HBPP_EXE)" > NUL
$(CC) @&&!
$(CFLAGS)
-e$(HBPPGEN_EXE)
-e$(HBPP_EXE)
$(**: = ^
)
$(COMMON_LIB)
@@ -588,18 +588,18 @@ $(DLL_OBJ_DIR)\mainstd$(OBJEXT) : $(VM_DIR)\mainstd.c
#**********************************************************
# Generated by an intermediate utility hbppgen.exe
# Generated by an intermediate utility hbpp.exe
# built at the initial phase of build process
$(OBJ_DIR)\pptable.obj : $(OBJ_DIR)\pptable.c
$(DLL_OBJ_DIR)\pptable.obj : $(DLL_OBJ_DIR)\pptable.c
$(OBJ_DIR)\pptable.c : include\hbstdgen.ch include\std.ch ChangeLog $(PP_DIR)\ppcore.c $(PP_DIR)\hbppgen.c
$(OBJ_DIR)\pptable.c : include\hbstdgen.ch include\std.ch ChangeLog $(PP_DIR)\ppcore.c $(PP_DIR)\hbpp.c
IF EXIST "$(OBJ_DIR)\pptable.c" $(DEL) "$(OBJ_DIR)\pptable.c" > nul
$(HBPPGEN) include/hbstdgen.ch -o$(OBJ_DIR)/pptable.c -q -cChangeLog -vinclude/hbverbld.h
$(HBPP) include/hbstdgen.ch -o$(OBJ_DIR)/pptable.c -q -cChangeLog -vinclude/hbverbld.h
$(DLL_OBJ_DIR)\pptable.c : include\hbstdgen.ch include\std.ch ChangeLog $(PP_DIR)\ppcore.c $(PP_DIR)\hbppgen.c
$(DLL_OBJ_DIR)\pptable.c : include\hbstdgen.ch include\std.ch ChangeLog $(PP_DIR)\ppcore.c $(PP_DIR)\hbpp.c
IF EXIST "$(DLL_OBJ_DIR)\pptable.c" $(DEL) "$(DLL_OBJ_DIR)\pptable.c" > nul
$(HBPPGEN) include/hbstdgen.ch -o$(DLL_OBJ_DIR)/pptable.c -q -cChangeLog -vinclude/hbverbld.h
$(HBPP) include/hbstdgen.ch -o$(DLL_OBJ_DIR)/pptable.c -q -cChangeLog -vinclude/hbverbld.h
#**********************************************************

10
harbour/make_gcc.mak
View File

@@ -288,7 +288,7 @@ all : $(HB_DEST_DIRS) $(HB_BUILD_TARGETS)
#**********************************************************
# Helper targets
#**********************************************************
BasicLibs : $(COMMON_LIB) $(HBPPGEN_EXE) $(PP_LIB) $(COMPILER_LIB)
BasicLibs : $(COMMON_LIB) $(HBPP_EXE) $(PP_LIB) $(COMPILER_LIB)
BasicExes : BasicLibs $(HB)
StdLibs : BasicExes $(STANDARD_STATIC_HBLIBS)
#**********************************************************
@@ -407,7 +407,7 @@ $(GTXWC_LIB) : $(GTXWC_LIB_OBJS)
#**********************************************************
# EXECUTABLE Targets BUILD rules
#**********************************************************
$(HBPPGEN_EXE) : $(HBPPGEN_EXE_OBJS) $(COMMON_LIB)
$(HBPP_EXE) : $(HBPP_EXE_OBJS) $(COMMON_LIB)
$(CC) $(CFLAGS) -o $@ $^ $(HB_OS_LIBS)
#**********************************************************
$(HARBOUR_EXE) : $(HARBOUR_EXE_OBJS) $(COMPILER_LIB) $(PP_LIB) $(COMMON_LIB)
@@ -464,15 +464,15 @@ $(DLL_OBJ_DIR)/mainstd$(OBJEXT) : $(VM_DIR)/mainstd.c
# EXTRA Object's DEPENDENCIES
#**********************************************************
# Generated by an intermediate utility hbppgen.exe
# Generated by an intermediate utility hbpp.exe
# built at the initial phase of build process
$(OBJ_DIR)/pptable$(OBJEXT) : $(OBJ_DIR)/pptable.c
$(DLL_OBJ_DIR)/pptable$(OBJEXT) : $(DLL_OBJ_DIR)/pptable.c
$(OBJ_DIR)/pptable.c : $(HBPPGEN) include/hbstdgen.ch include/std.ch ChangeLog $(PP_DIR)/ppcore.c $(PP_DIR)/hbppgen.c
$(OBJ_DIR)/pptable.c : $(HBPP) include/hbstdgen.ch include/std.ch ChangeLog $(PP_DIR)/ppcore.c $(PP_DIR)/hbpp.c
$< include/hbstdgen.ch -o$@ -q -cChangeLog -vinclude/hbverbld.h
$(DLL_OBJ_DIR)/pptable.c : $(HBPPGEN) include/hbstdgen.ch include/std.ch ChangeLog $(PP_DIR)/ppcore.c $(PP_DIR)/hbppgen.c
$(DLL_OBJ_DIR)/pptable.c : $(HBPP) include/hbstdgen.ch include/std.ch ChangeLog $(PP_DIR)/ppcore.c $(PP_DIR)/hbpp.c
$< include/hbstdgen.ch -o$@ -q -cChangeLog -vinclude/hbverbld.h
#**********************************************************

18
harbour/make_vc.mak
View File

@@ -793,13 +793,13 @@ $(COMPILER_LIB)
$(PP_LIB)
<<$(KEEPSTATE)
#**********************************************************
# HBPPGEN build rule
# HBPP build rule
#**********************************************************
$(HBPPGEN_EXE) : $(HBPPGEN_EXE_OBJS)
IF EXIST "$(HBPPGEN_EXE)" $(DEL) "$(HBPPGEN_EXE)" > nul
$(HBPP_EXE) : $(HBPP_EXE_OBJS)
IF EXIST "$(HBPP_EXE)" $(DEL) "$(HBPP_EXE)" > nul
$(LINKER) @<<
$(LDFLAGS)
/OUT:$(HBPPGEN_EXE)
/OUT:$(HBPP_EXE)
$(**: = ^
)
$(COMMON_LIB)
@@ -932,18 +932,18 @@ $(DLL_OBJ_DIR)\mainstd$(OBJEXT) : $(VM_DIR)\mainstd.c
# EXTRA Object's DEPENDENCIES
#**********************************************************
# Generated by an intermediate utility hbppgen.exe
# Generated by an intermediate utility hbpp.exe
# built at the initial phase of build process
$(OBJ_DIR)\pptable.obj : $(OBJ_DIR)\pptable.c
$(DLL_OBJ_DIR)\pptable.obj : $(DLL_OBJ_DIR)\pptable.c
$(OBJ_DIR)\pptable.c : include\hbstdgen.ch include\std.ch ChangeLog $(PP_DIR)\ppcore.c $(PP_DIR)\hbppgen.c
$(OBJ_DIR)\pptable.c : include\hbstdgen.ch include\std.ch ChangeLog $(PP_DIR)\ppcore.c $(PP_DIR)\hbpp.c
IF EXIST "$(OBJ_DIR)\pptable.c" $(DEL) "$(OBJ_DIR)\pptable.c" > nul
$(HBPPGEN) include/hbstdgen.ch -o$(OBJ_DIR)/pptable.c -q -cChangeLog -vinclude/hbverbld.h
$(HBPP) include/hbstdgen.ch -o$(OBJ_DIR)/pptable.c -q -cChangeLog -vinclude/hbverbld.h
$(DLL_OBJ_DIR)\pptable.c : include\hbstdgen.ch include\std.ch ChangeLog $(PP_DIR)\ppcore.c $(PP_DIR)\hbppgen.c
$(DLL_OBJ_DIR)\pptable.c : include\hbstdgen.ch include\std.ch ChangeLog $(PP_DIR)\ppcore.c $(PP_DIR)\hbpp.c
IF EXIST "$(DLL_OBJ_DIR)\pptable.c" $(DEL) "$(DLL_OBJ_DIR)\pptable.c" > nul
$(HBPPGEN) include/hbstdgen.ch -o$(DLL_OBJ_DIR)/pptable.c -q -cChangeLog -vinclude/hbverbld.h
$(HBPP) include/hbstdgen.ch -o$(DLL_OBJ_DIR)/pptable.c -q -cChangeLog -vinclude/hbverbld.h
#**********************************************************

14
harbour/make_vcce.bat
View File

@@ -48,9 +48,9 @@ if "%1" == "INSTALL" goto INSTALL
rem ---------------------------------------------------------------
rem Checking if HB and HBPPGEN are set
rem Checking if HB and HBPP are set
if not "%HB%" == "" if exist %HB% goto CHECK_HBPPGEN
if not "%HB%" == "" if exist %HB% goto CHECK_HBPP
echo.
echo *******************************************
echo You must set HB environment variable to a
@@ -61,13 +61,13 @@ if not "%HB%" == "" if exist %HB% goto CHECK_HBPPGEN
echo.
goto EXIT
:CHECK_HBPPGEN
if not "%HBPPGEN%" == "" if exist %HBPPGEN% goto BUILD
:CHECK_HBPP
if not "%HBPP%" == "" if exist %HBPP% goto BUILD
echo.
echo **********************************************
echo You must set HBPPGEN environment variable to a
echo working copy of hbppgen.exe helper executable
echo. Example : set HBPPGEN=C:\Harbour\hbppgen.exe
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

18
harbour/make_vcce.mak
View File

@@ -800,13 +800,13 @@ $(PP_LIB)
coredll.lib corelibc.lib
<<$(KEEPSTATE)
#**********************************************************
# HBPPGEN build rule
# HBPP build rule
#**********************************************************
$(HBPPGEN_EXE) : $(HBPPGEN_EXE_OBJS)
IF EXIST "$(HBPPGEN_EXE)" $(DEL) "$(HBPPGEN_EXE)" > nul
$(HBPP_EXE) : $(HBPP_EXE_OBJS)
IF EXIST "$(HBPP_EXE)" $(DEL) "$(HBPP_EXE)" > nul
$(LINKER) @<<
$(LDFLAGS)
/OUT:$(HBPPGEN_EXE)
/OUT:$(HBPP_EXE)
$(**: = ^
)
$(COMMON_LIB)
@@ -938,18 +938,18 @@ $(DLL_OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c
# EXTRA Object's DEPENDENCIES
#**********************************************************
# Generated by an intermediate utility hbppgen.exe
# Generated by an intermediate utility hbpp.exe
# built at the initial phase of build process
$(OBJ_DIR)\pptable.obj : $(OBJ_DIR)\pptable.c
$(DLL_OBJ_DIR)\pptable.obj : $(DLL_OBJ_DIR)\pptable.c
$(OBJ_DIR)\pptable.c : include\hbstdgen.ch include\std.ch ChangeLog $(PP_DIR)\ppcore.c $(PP_DIR)\hbppgen.c
$(OBJ_DIR)\pptable.c : include\hbstdgen.ch include\std.ch ChangeLog $(PP_DIR)\ppcore.c $(PP_DIR)\hbpp.c
IF EXIST "$(OBJ_DIR)\pptable.c" $(DEL) "$(OBJ_DIR)\pptable.c" > nul
$(HBPPGEN) include/hbstdgen.ch -o$(OBJ_DIR)/pptable.c -q -cChangeLog -vinclude/hbverbld.h
$(HBPP) include/hbstdgen.ch -o$(OBJ_DIR)/pptable.c -q -cChangeLog -vinclude/hbverbld.h
$(DLL_OBJ_DIR)\pptable.c : include\hbstdgen.ch include\std.ch ChangeLog $(PP_DIR)\ppcore.c $(PP_DIR)\hbppgen.c
$(DLL_OBJ_DIR)\pptable.c : include\hbstdgen.ch include\std.ch ChangeLog $(PP_DIR)\ppcore.c $(PP_DIR)\hbpp.c
IF EXIST "$(DLL_OBJ_DIR)\pptable.c" $(DEL) "$(DLL_OBJ_DIR)\pptable.c" > nul
$(HBPPGEN) include/hbstdgen.ch -o$(DLL_OBJ_DIR)/pptable.c -q -cChangeLog -vinclude/hbverbld.h
$(HBPP) include/hbstdgen.ch -o$(DLL_OBJ_DIR)/pptable.c -q -cChangeLog -vinclude/hbverbld.h
#**********************************************************

2
harbour/make_xmingw.sh
View File

@@ -110,7 +110,7 @@ else
exit 1
fi
ln -s "$DIR/source/pp/$UNAMEL/gcc/hbppgen" ${HB_BIN_COMPILE}/hbppgen.exe
ln -s "$DIR/source/pp/$UNAMEL/gcc/hbpp" ${HB_BIN_COMPILE}/hbpp.exe
export HB_PPGEN_PATH=${HB_BIN_COMPILE}
case "$1" in

2
harbour/make_xmingwce.sh
View File

@@ -70,7 +70,7 @@ else
exit 1
fi
ln -s "$DIR/source/pp/$HB_HOST_ARCH/$HB_HOST_CC/hbppgen" ${HB_BIN_COMPILE}/hbppgen.exe
ln -s "$DIR/source/pp/$HB_HOST_ARCH/$HB_HOST_CC/hbpp" ${HB_BIN_COMPILE}/hbpp.exe
export HB_PPGEN_PATH=${HB_BIN_COMPILE}
case "$1" in

6
harbour/source/pp/Makefile
View File

@@ -28,12 +28,12 @@ ifneq ($(HB_PP_RULES),)
pptable.c : $(HB_PP_RULES)
$(CP) $(subst /,$(DIRSEP),$<) $@
else
pptable.c : hbppgen$(EXE_EXT)
$(HB_PPGEN_PATH)/hbppgen$(EXE_EXT) $(TOP)$(ROOT)include/hbstdgen.ch -opptable.c -q -c -v$(TOP)$(ROOT)include/hbverbld.h
pptable.c : hbpp$(EXE_EXT)
$(HB_PPGEN_PATH)/hbpp$(EXE_EXT) $(TOP)$(ROOT)include/hbstdgen.ch -opptable.c -q -c -v$(TOP)$(ROOT)include/hbverbld.h
endif
ifneq ($(HB_BIN_INSTALL),)
INSTALL_OBJS = $(ARCH_DIR)/hbppgen$(EXE_EXT)
INSTALL_OBJS = $(ARCH_DIR)/hbpp$(EXE_EXT)
INSTALL_DIR = $(HB_BIN_INSTALL)
HB_INSTALL_DEF=yes
include $(TOP)$(ROOT)config/install.cf

0
harbour/source/pp/hbppgen.c → harbour/source/pp/hbpp.c
View File