source: GPL/trunk/diff.log@ 598

Last change on this file since 598 was 598, checked in by David Azarewicz, 9 years ago

Merged/reintegrated v2 branch into trunk. Trunk is now v2

File size: 2.8 KB
Line 
1Index: drv32/Makefile
2===================================================================
3--- drv32/Makefile (revision 593)
4+++ drv32/Makefile (working copy)
5@@ -85,7 +85,7 @@
6 @%write $^@ option cache
7 @%write $^@ option alignment=16
8 @%write $^@ option map=$(WMAPNAME)
9- @$(ROOT)\tools\AddToFile.cmd $^@,$option description,BLDLEVEL,$(BLDLVL_VENDOR),$(BLDLVL_VERSION),Universal Audio Driver for OS/2 (c) %Y $(BLDLVL_VENDOR),$(BLDLVL_FIXPACK)
10+ @$(ROOT)\tools\AddToFile.cmd $^@,$option description,BLDLEVEL,$(BLDLVL_VENDOR),$(BLDLVL_VERSION),Universal Audio Driver for OS/2 (c) %Y $(BLDLVL_VENDOR),$(BLDLVL_FIXPACK),$(BLDLVL_ALSA)
11 @%write $^@ name $(OBJDIR)\$(TARGET).sys
12 @for %f in ($(FILES)) do @%append $^@ file $(OBJDIR)\%f
13 @for %f in ($(LIBS)) do @%append $^@ library %f
14@@ -104,7 +104,7 @@
15
16 $(OBJDIR)\$(TARGET).sys: $(LNKFILE) $(FILES) $(LIBS)
17 @%create $(DEFFILE)
18- $(ROOT)\tools\AddToFile.cmd $(DEFFILE),description,BLDLEVEL,$(BLDLVL_VENDOR),$(BLDLVL_VERSION),Universal Audio Driver for OS/2 (c) %Y $(BLDLVL_VENDOR),$(BLDLVL_FIXPACK)
19+ $(ROOT)\tools\AddToFile.cmd $(DEFFILE),description,BLDLEVEL,$(BLDLVL_VENDOR),$(BLDLVL_VERSION),Universal Audio Driver for OS/2 (c) %Y $(BLDLVL_VENDOR),$(BLDLVL_FIXPACK),$(BLDLVL_ALSA)
20 $(LINK) @$(LNKFILE)
21 copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN)
22
23Index: tools/AddToFile.cmd
24===================================================================
25--- tools/AddToFile.cmd (revision 593)
26+++ tools/AddToFile.cmd (working copy)
27@@ -10,7 +10,7 @@
28 */
29 call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs'
30 call SysLoadFuncs
31-parse arg OutFile','String','Function','Parm1','Parm2','Parm3','Parm4;
32+parse arg OutFile','String','Function','Parm1','Parm2','Parm3','Parm4','Parm5;
33
34 if (OutFile='') then do
35 Say 'Usage:';
36@@ -32,7 +32,7 @@
37 MyCmd=MyFile||',#define DDATE,DATEL';
38 rc=LineOut(MyFile, '--- AddToFile.cmd '||MyCmd);
39 call 'AddToFile.cmd' MyCmd;
40- MyCmd=MyFile||',option description,BLDLEVEL,Vendor,1.2.3,Description,Fixpack';
41+ MyCmd=MyFile||',option description,BLDLEVEL,Vendor,1.2.3,Description,Fixpack,Asd';
42 rc=LineOut(MyFile, '--- AddToFile.cmd '||MyCmd);
43 call 'AddToFile.cmd' MyCmd;
44 MyCmd=MyFile||',char *bl = "%A";,BLDLEVEL,Vendor,1.2.3,Description,Fixpack';
45@@ -99,7 +99,7 @@
46 Parm3=Substr(Parm3,1,RepLoc-1)||FORMAT(SUBSTR(DATE('S'), 1, 4))||Substr(Parm3,RepLoc+2);
47 end
48
49- NewStr='@#'||Parm1||':'||Parm2||'#@##1## '||ProjString||'::::'||ProjVersion||'::'||Parm4||'@@'||Parm3;
50+ NewStr='@#'||Parm1||':'||Parm2||'#@##1## '||ProjString||':'||Parm5||':::'||ProjVersion||'::'||Parm4||'@@'||Parm3;
51 if (Type='2') then do
52 /*OutStr=String||' "@#'||Parm1||':'||Parm2||'#@##1## '||ProjString||'::::'||ProjVersion||'::'||Parm4||'@@'||Parm3||'"';*/
53 OutStr=String||' "'||NewStr||'"';
Note: See TracBrowser for help on using the repository browser.