Changeset 95

Timestamp:

May 2, 2011, 12:21:51 PM (14 years ago)

Author:

markus

Message:

removed os2ahci.def from SVN, since it's a created file; changed makefile and bldlevel.cmd accordingly

Location:

trunk

Files:

• src/os2ahci/Makefile (modified) (1 diff)
• src/os2ahci/os2ahci.def (deleted)
• src/os2ahci/os2ahci.def.template (added)
• tools/bldlvl.cmd (modified) (7 diffs)

trunk/src/os2ahci/Makefile

@@ -127 +127 @@
         $(CC) $(CFLAGS) $(CC_INCLUDE) $*.c
 
+os2ahci.def:
+        $(BLDLEVEL) os2ahci.def.template os2ahci.def version.h
+
+
 $(TARGET): $(OBJS) os2ahci.def Makefile
-        $(BLDLEVEL) os2ahci.def version.h
         $(LD) $(LFLAGS) $(OBJS),$(TARGET),$*.map,$(LIB_DIRS) $(LIBS),$*.def
         $(MAPSYM) os2ahci

trunk/tools/bldlvl.cmd

@@ -67 +67 @@
                                            the BLDLEVEL and the Headerfile (*.H*) where
                                            the required BLDLEVEL data is defined in */
-Parse Arg DefinitionFile HeaderFile .
-Do While (DefinitionFile\="" & HeaderFile\="")
+Parse Arg TemplateFile DefinitionFile HeaderFile .
+Do While (TemplateFile\="" & DefinitionFile\="" & HeaderFile\="")
   /* We have valid commandline arguments, so first see
    if the Headerfile contents are ok for us */
   ReturnCode=ParseHeaderFile()
   If ReturnCode\=0 Then Leave
-  /* Parse the definition file (*.DEF) for the module
+  /* Parse the template DEF file for the module
    name, to see if we got a valid file */
-  ReturnCode=ParseDefinitionFile()
+  ReturnCode=ParseTemplateFile()
   If ReturnCode\=0 Then Leave
-  /* Copy the definition file, because we're going to
-   change the original */
-  Command="@copy "||DefinitionFile||" "||DefinitionCopy||" /v >NUL"
-  Command
-  Command="@del "||DefinitionFile||" >NUL 2>&1"
-  Command
-  If (rc\=0) Then Do
-    ReturnCode=2
-    Leave
-    End
   
   /* Build DESCRIPTION statement for *.DEF file */
@@ -97 +87 @@
   Description=Description_Header||BldLevel||Description_Trailer
   
-  /* Copy the module definition file to be able to change
-   the contents of the original one. In case of an error
-   copy back the original one */
   ReturnCode=ModifyDefinitionFile()
   If ReturnCode\=0 Then Do
-    Command="@copy "||DefinitionCopy||" "||DefinitionFile||" /v >NUL"
-    Command
     Command="@del "||DefinitionCopy||" >NUL 2>&1"
     Command
@@ -110 +95 @@
 
   /* Exit with success */
+  Command="@copy "||DefinitionCopy||" "||DefinitionFile||" /v >NUL"
+  Command
   Command="@del "||DefinitionCopy||" >NUL 2>&1"
   Command
@@ -175 +162 @@
  *      ReturnCode .... Error code (0 if no error)                                      *
  \*--------------------------------------------------------------------------------------*/
-ParseDefinitionFile:
+ParseTemplateFile:
 /* Read ahead 1st line */
-  Command=Stream(DefinitionFile, 'C', 'OPEN READ')
+  Command=Stream(TemplateFile, 'C', 'OPEN READ')
   LinesLeft=2
-  CurrentLine=LineIn(DefinitionFile)
+  CurrentLine=LineIn(TemplateFile)
 /* Do while there are lines in the file */
   Do While(LinesLeft>0)
@@ -202 +189 @@
     If (Statement="DESCRIPTION") Then
       DescriptionStatement=Options
-    CurrentLine=LineIn(DefinitionFile)
+    CurrentLine=LineIn(TemplateFile)
     /* As Lines() returns 0 after having read the last line
      we have to ensure that this last line will be processed too */
-    If (Lines(DefinitionFile)=0) Then
+    If (Lines(TemplateFile)=0) Then
       LinesLeft=LinesLeft-1
     End
 /* Close the stream */
-  Command=Stream(DefinitionFile, 'C', 'CLOSE')
+  Command=Stream(TemplateFile, 'C', 'CLOSE')
   If (ModuleName\="" & DescriptionStatement\="") Then
     Return 0
@@ -225 +212 @@
 ModifyDefinitionFile:
 /* Read and write ahead 1st line */
-  Command=Stream(DefinitionFile, 'C', 'OPEN WRITE')
+  Command=Stream(DefinitionCopy, 'C', 'OPEN WRITE')
   If (Command="ERROR") Then
     Return 30
-  Command=Stream(DefinitionCopy, 'C', 'OPEN READ')
+  Command=Stream(TemplateFile, 'C', 'OPEN READ')
   If (Command="ERROR") Then
     Return 31
   LinesLeft=2
-  CurrentLine=LineIn(DefinitionCopy)
+  CurrentLine=LineIn(TemplateFile)
 /* Do while there are lines in the file */
   Do While(LinesLeft>0)
@@ -243 +230 @@
     Statement=Space(Statement, 0)
     If (Statement="DESCRIPTION") Then Do
-      Command=LineOut(DefinitionFile, Description)
+      Command=LineOut(DefinitionCopy, Description)
       End
     Else Do
-      Command=LineOut(DefinitionFile, CurrentLine)
-      End
-    CurrentLine=LineIn(DefinitionCopy)
+      Command=LineOut(DefinitionCopy, CurrentLine)
+      End
+    CurrentLine=LineIn(TemplateFile)
     /* As Lines() returns 0 after having read the last line
      we have to ensure that this last line will be processed too */
-    If (Lines(DefinitionCopy)=0) Then
+    If (Lines(TemplateFile)=0) Then
       LinesLeft=LinesLeft-1
     End
 /* Close the streams */
-  Command=Stream(DefinitionFile, 'C', 'CLOSE')
+  Command=Stream(TemplateFile, 'C', 'CLOSE')
   Command=Stream(DefinitionCopy, 'C', 'CLOSE')
 Return 0