Changeset 322 for branches/client-1.5/src

Timestamp:

Sep 1, 2009, 5:40:59 PM (16 years ago)

Author:

Yuri Dario

Message:

New build rules for help files.

Location:

branches/client-1.5/src

Files:

• BuildAll.cmd (added)
• Makefile.kmk (modified) (4 diffs)
• help (added)
• help/ndpsmb.ipf (moved) (moved from branches/client-1.5/src/rc/rc.ipf ) (3 diffs)
• version.h_ (added)

branches/client-1.5/src/Makefile.kmk

@@ -19 +19 @@
 DLLS = ndpsmb
 
+# required to get IPFC compiler to work correctly
+export IPFC=$(TOOLKIT)\IPFC
+
 ndpsmb_RCTOOL =OPENWATCOM
 TOOL_OPENWATCOM_RCFLAGS += -i=$(TOOLKIT)/h
 
 ndpsmb_SOURCES = \
+        version.h \
         rc/rc.rc \
         ndpsmb.def \
@@ -32 +36 @@
 
 ndpsmb_CFLAGS = -Zomf
-ndpsmb_CFLAGS.release = -s -O3 -march=pentium -mcpu=pentium4
+# YD -O2/O3 triggers stack variable alignment bug in gcc 4.3.2/4.4.0!
+ndpsmb_CFLAGS.release = -g -O1 -march=pentium -mtune=pentium4
 ndpsmb_CFLAGS.debug = -g -O0 -DDEBUG_PRINTF
 ndpsmb_LDFLAGS = -Zomf -Zno-fork -Zmap -Zbin-files
@@ -56 +61 @@
 
 #build other files (e.g. help)
-OTHERS = /rc/rc.ipf $(PATH_BIN)/ndpsmb.hlp $(PATH_BIN)/readme.txt
-OTHER_CLEAN = $(PATH_BIN)/ndpsmb.hlp $(PATH_BIN)/readme.txt
+OTHERS = $(PATH_BIN)/ndpsmb.hlp $(PATH_BIN)/readme.txt
+OTHER_CLEAN = $(PATH_BIN)/ndpsmb.hlp $(PATH_OBJ)/ndpsmb.ipf $(PATH_BIN)/readme.txt
 
 
@@ -90 +95 @@
         @BldLevelInf0.cmd $(VERSION) $(BUILD)
 
-# substitute macros in ipf file
-/rc/rc.ipf: Config.kmk ./rc/rc.ipf
-        $(QUIET)$(SED) "s;_VERSION_;$(VERSION);g" ./rc/rc.ipf \
+# compile help file
+$(PATH_BIN)/ndpsmb.hlp: ./help/ndpsmb.ipf version.h Config.kmk
+        @ppwizard.cmd ./help/ndpsmb.ipf /Pack:N /output:$(PATH_OBJ)/ndpsmb.ipf /other /WarningsRc:0
+        -@mkdir $(PATH_BIN)
+        $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/ndpsmb.ipf $(PATH_BIN)/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
+
+# substitute macros in version.h
+version.h: Config.kmk version.h_
+        $(SED) "s;_VERSION_;$(VERSION);g" version.h_ \
+                | $(SED) "s;_WPIVERSION_;$(subst .,\\\,$(VERSION));g" \
                 | $(SED) "s;_BUILD_;$(BUILD);g" \
-                > rc.ipf
-
-# compile help file
-$(PATH_BIN)/ndpsmb.hlp: rc.ipf ./rc/rc.h ./H/hmacros.h config.kmk
-        -gcc -E -I./h -I./rc -x c rc.ipf > rc.i
-        -@mkdir $(PATH_BIN)
-        $(TOOLKIT)\bin\ipfc.exe rc.i $(PATH_BIN)/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
-        rm rc.i
-        rm rc.ipf
+                > version.h
 
 # substitute macros in docs

branches/client-1.5/src/help/ndpsmb.ipf

@@ -1 @@
-#include <hmacros.h>
-#include "rc.h"
+#include "version.h"
 
 :userdoc.
@@ -10 +9 @@
 .nameit symbol=ressmb text='Samba Resource Properties'
 .nameit symbol=usage text='Usage'
-.nameit symbol=build text='Samba client for &os. version _VERSION_ build _BUILD_'
+.nameit symbol=build text='Samba client for &os. version <$NDPSMB_VERSION> build <$NDPSMB_BUILD>'
 
 :title.NetDrive for &os. Control Panel Help
@@ -51 +50 @@
 :eul.
 .*******************************************************
-HEADING(1,DLG_ID)&ressmb.
-PINDEX(ressmb)&ressmb.
+:h1 res=1000 group=2 x=left y=top width=100% height=100% scroll=both.&ressmb.
+:i1 id=ressmb.&ressmb.
 :ul.
 :li.:link reftype=hd res=100.&ressmb.:elink.