20000307-12:35 GMT+1 Victor Szakats <info@szelvesz.hu>

harbour/ChangeLog

@@ -1,3 +1,24 @@
+20000307-12:35 GMT+1 Victor Szakats <info@szelvesz.hu>
+   * source/pp/hbpp.c    -> ppcore.c
+     source/pp/hbppint.c -> ppcomp.c
+     source/pp/hbpplib.c -> pplib.c
+     source/pp/table.c   -> pptable.c
+     source/pp/Makefile
+     makefile.bc
+     makefile.vc
+     * Renamed to avoid collision with other files in the make process
+       (currently the standalone hbpp.c)
+   * bin\bld_vc.bat
+     - Removed -DDEBUG and -DHARBOUR_USE_WIN_GTAPI, they are not needed to
+       compile a generated C output.
+   * makefile.bc
+     bin\bld_*.bat
+     + Changed names of libraries. Now they are compatible with the GNU-make
+       library names.
+     ; NOTE: Since now Harbour has a common library naming system, which is 
+       used in all make systems. Documentation can refer to them in the 
+       $FILES$ section.
+
 20000307-03:45 EST Paul Tucker <ptucker@sympatico.ca>
    * doc/gmake.txt
      - removed note about unistd.h for msvc

harbour/bin/bld_b16.bat

@@ -6,15 +6,16 @@ rem
 ..\bin\harbour %1 %2 %3 /n /i..\include
 echo -O2 -I..\include -mh -L..\lib\b16 > build.tmp
 echo %1.c >> build.tmp
-echo harbour.lib >> build.tmp
-echo pp.lib >> build.tmp
 echo common.lib >> build.tmp
-echo terminal.lib >> build.tmp
+echo vm.lib >> build.tmp
+echo rtl.lib >> build.tmp
+echo rdd.lib >> build.tmp
 echo macro.lib >> build.tmp
-echo dbfntx.lib >> build.tmp
-echo dbfcdx.lib >> build.tmp
 echo debug.lib >> build.tmp
 echo tools.lib >> build.tmp
+echo pp.lib >> build.tmp
+echo dbfntx.lib >> build.tmp
+echo dbfcdx.lib >> build.tmp
 bcc @build.tmp
 del build.tmp
 del %1.c

harbour/bin/bld_b32.bat

@@ -4,5 +4,5 @@ rem $Id$
 rem
 
 ..\bin\harbour %1 %2 %3 /n /i..\include
-bcc32 %1.c -e%1.exe -5 -O2 -I..\include -L..\lib\b32  common.lib dbfcdx.lib dbfntx.lib debug.lib harbour.lib pp.lib macro.lib terminal.lib tools.lib
+bcc32 %1.c -e%1.exe -5 -O2 -I..\include -L..\lib\b32 common.lib vm.lib rtl.lib rdd.lib macro.lib debug.lib tools.lib pp.lib dbfntx.lib dbfcdx.lib
 rem del %1.c

harbour/bin/bld_b32o.bat

@@ -4,6 +4,6 @@ rem $Id$
 rem
 
 ..\bin\harbour %1 %2 %3 /n /i..\include /gf
-tlink32 -L..\lib\b32 c0x32.obj %1.obj hvm.obj,%1.exe,, common.lib dbfcdx.lib dbfntx.lib debug.lib harbour.lib pp.lib macro.lib terminal.lib import32.lib cw32mt.lib tools.lib
+tlink32 -L..\lib\b32 c0x32.obj %1.obj hvm.obj,%1.exe,, common.lib vm.lib rtl.lib rdd.lib macro.lib debug.lib tools.lib pp.lib dbfntx.lib dbfcdx.lib import32.lib cw32mt.lib
 del %1.obj
 

harbour/bin/bld_b32w.bat

@@ -4,5 +4,5 @@ rem $Id$
 rem
 
 ..\bin\harbour %1 %2 %3 /n /i..\include
-bcc32 %1.c -e%1.exe -O2 -I..\include -L..\lib\b32 -5 -tW common.lib dbfcdx.lib dbfntx.lib debug.lib harbour.lib pp.lib macro.lib terminal.lib tools.lib
+bcc32 %1.c -e%1.exe -O2 -I..\include -L..\lib\b32 -5 -tW common.lib vm.lib rtl.lib rdd.lib macro.lib debug.lib tools.lib pp.lib dbfntx.lib dbfcdx.lib
 rem del %1.c

harbour/bin/bld_tpl.bat

@@ -8,8 +8,7 @@ rem Flavour: DOS/Windows batch file
 rem ---------------------------------------------------------------
 rem Template to build a final Harbour executable, using Harbour
 rem with the C code generation feature, then calling the proper C
-rem linker/compiler. This file will only work if Harbour was built
-rem using the GNU-make system.
+rem linker/compiler.
 rem
 rem Copyright 1999 Victor Szakats <info@szelvesz.hu>
 rem See doc/license.txt for licensing terms.

harbour/bin/bld_tpl.cmd

@@ -8,8 +8,7 @@ rem Flavour: OS/2 command file
 rem ---------------------------------------------------------------
 rem Template to build a final Harbour executable, using Harbour
 rem with the C code generation feature, then calling the proper C
-rem linker/compiler. This file will only work if Harbour was built
-rem using the GNU-make system.
+rem linker/compiler.
 rem
 rem Copyright 1999 Victor Szakats <info@szelvesz.hu>
 rem See doc/license.txt for licensing terms.

harbour/bin/bld_vc.bat

@@ -4,5 +4,5 @@ rem $Id$
 rem
 
 ..\bin\harbour %1 %2 %3 /n /i..\include
-cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -DDEBUG -DHARBOUR_USE_WIN_GTAPI -I..\include %1.c /link /subsystem:CONSOLE  ..\lib\vc\rtl.lib ..\lib\vc\common.lib ..\lib\vc\tools.lib ..\lib\vc\rdd.lib ..\lib\vc\nulsys.lib ..\lib\vc\dbfntx.lib ..\lib\vc\dbfcdx.lib ..\lib\vc\debug.lib ..\lib\vc\macro.lib ..\lib\vc\vm.lib
+cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -I..\include %1.c /link /subsystem:CONSOLE ..\lib\vc\rtl.lib ..\lib\vc\common.lib ..\lib\vc\tools.lib ..\lib\vc\rdd.lib ..\lib\vc\nulsys.lib ..\lib\vc\dbfntx.lib ..\lib\vc\dbfcdx.lib ..\lib\vc\debug.lib ..\lib\vc\macro.lib ..\lib\vc\vm.lib
 del %1.c

harbour/makefile.vc

@@ -268,10 +268,10 @@ RUNNER_LIB_OBJS = \
 #
 
 PP_LIB_OBJS = \
-    $(OBJ_DIR)\hbpp.obj \
-    $(OBJ_DIR)\hbppint.obj \
-    $(OBJ_DIR)\hbpplib.obj \
-    $(OBJ_DIR)\table.obj
+    $(OBJ_DIR)\ppcore.obj \
+    $(OBJ_DIR)\ppcomp.obj \
+    $(OBJ_DIR)\pplib.obj \
+    $(OBJ_DIR)\pptable.obj
 
 #
 # OBJ list for debug.lib. Add new ones as needed
@@ -436,9 +436,9 @@ $(HARBOUR_EXE) : \
     $(COMMON_DIR)\reserved.c \
     $(COMMON_DIR)\hbfsapi.c \
     $(COMMON_DIR)\hbstr.c \
-    $(PP_DIR)\hbpp.c \
-    $(PP_DIR)\hbppint.c \
-    $(PP_DIR)\table.c
+    $(PP_DIR)\ppcore.c \
+    $(PP_DIR)\ppcomp.c \
+    $(PP_DIR)\pptable.c
     $(CC) $(CFLAGS) -w $** -o $(HARBOUR_EXE)
     -del harbour.obj
     -del harboury.obj
@@ -458,9 +458,9 @@ $(HARBOUR_EXE) : \
     -del expropt.obj
     -del hbfsapi.obj
     -del hbstr.obj
-    -del hbpp.obj
-    -del hbppint.obj
-    -del table.obj
+    -del ppcore.obj
+    -del ppcomp.obj
+    -del pptable.obj
 
 #
 # Library dependencies and build rules
@@ -535,16 +535,16 @@ $(OBJ_DIR)\macro.obj : $(MACRO_DIR)\macro.c
 # PP source dependencies below. Add as needed
 #
 
-$(OBJ_DIR)\hbpplib.obj : $(PP_DIR)\hbpplib.c
+$(OBJ_DIR)\pplib.obj : $(PP_DIR)\pplib.c
     $(CC) $(CLIBFLAGS) -Fo$@ $**
 
-$(OBJ_DIR)\hbpp.obj : $(PP_DIR)\hbpp.c
+$(OBJ_DIR)\ppcore.obj : $(PP_DIR)\ppcore.c
     $(CC) $(CLIBFLAGS) -Fo$@ $**
 
-$(OBJ_DIR)\hbppint.obj : $(PP_DIR)\hbppint.c
+$(OBJ_DIR)\ppcomp.obj : $(PP_DIR)\ppcomp.c
     $(CC) $(CLIBFLAGS) -Fo$@ $**
 
-$(OBJ_DIR)\table.obj : $(PP_DIR)\table.c
+$(OBJ_DIR)\pptable.obj : $(PP_DIR)\pptable.c
     $(CC) $(CLIBFLAGS) -Fo$@ $**
 
 

harbour/source/pp/Makefile

@@ -5,10 +5,10 @@
 ROOT = ../../
 
 C_SOURCES=\
-        hbpp.c \
-        hbppint.c \
-        hbpplib.c \
-        table.c \
+        ppcore.c \
+        ppcomp.c \
+        pplib.c \
+        pptable.c \
 
 LIBNAME=pp