Changeset 254

Timestamp:

Sep 20, 2007, 4:11:41 AM (18 years ago)

Author:

Brendan Oakley

Message:

Update to mkversion, adds bldlevel to CARDINFO.DLL and auto-updates version in control.scr, from Allan

Location:

OCO/trunk

Files:

• install/makefile (modified) (3 diffs)
• tools/mkversion.cmd (modified) (3 diffs)

OCO/trunk/install/makefile

@@ -15 +15 @@
 BASEINC  = $(%UNIBASE16)\include
 BUILDINC = $(%UNIBASE16)\bin
+INSTALLINC = $(%UNIBASE16)\bin\install.lnk
 
 PRODUCT_NAME = IBM Generic Audio
@@ -86 +87 @@
   @%write $^@ Name        $(RCDLL).DLL
   @%write $^@ System      os2v2 dll
-  @%write $^@ Option      Description '$(PRODUCT_NAME) Installation Dll'
+#  @%write $^@ Option      Description '$(PRODUCT_NAME) Installation Dll'
   @%write $^@ File        $(RCOBJS)
   @%write $^@ library     clib3r.lib
@@ -92 +93 @@
 
 $(RCDLL).dll:   $(RCOBJS) $(RCRES).rc $(RCDLL).lrf
-  $(LINK) $(LFLAGS) @$(RCDLL).lrf
+  $(LINK) $(LFLAGS) @$(RCDLL).lrf @$(INSTALLINC)
   $(RC) $(RFLAGS) $(RCRES).rc $(RCDLL).dll
   @if exist $(%UNIBASE16)\release @copy $(RCDLL).dll $(%UNIBASE16)\release

OCO/trunk/tools/mkversion.cmd

@@ -21 +21 @@
 versConst = sAlsaBase'\mif\uniaud.inc'
 versMak   = sAlsaBase'\bin\version.lnk'
+versInst  = sAlsaBase'\bin\install.lnk'
 versHdr   = sAlsaBase'\bin\version.h'
 
@@ -91 +92 @@
 call lineout versMak
 
+dummy = SysFileDelete(versInst)
+call lineout versInst, "option description '@#"ProjVendor":"major"."minor"#@##1## "ProjString"::::"ProjVersion"::"Fixpack"@@Installer for "productname"'"
+call lineout versInst
+
 
 /* construct the vesion header
@@ -137 +142 @@
 end
 
+/* Patch control.scr to include correct version in ssversion lines */
+
+ctr = sAlsaBase'\install\control.scr'
+tempctr = sAlsaBase'\install\control.TMP'
+do while(LINES(ctr))
+    tmpLine = LINEIN(ctr)
+    IF POS('ssversion=', tmpline) = 1 
+     Then tmpline = 'ssversion="'projvers'"'
+    call lineout tempctr, tmpline
+end
+
+call stream ctr, 'c', 'close'
+call stream tempctr, 'c', 'close'
+'@copy' tempctr ctr '>nul'
+'@del' tempctr '>nul'
+
+
 exit 0;