Changeset 3690

Timestamp:

Oct 26, 2019, 7:08:59 PM (5 years ago)

Author:

Andreas Schnellbacher

Message:

• RecompileNew: More fixes for the new features of changesets r3669 and r3677.

File:

• trunk/src/netlabs/macros/recompile.e (modified) (19 diffs)

trunk/src/netlabs/macros/recompile.e ¶

@@ -676 +676 @@
       KeyPathEFileChecks   = KeyPath'\EFileChecks' -- EFileChecks = fDifferent;...
 
+      SavedEFiles      = QueryConfigKey( KeyPathEFiles)
+      SavedEFileTimes  = QueryConfigKey( KeyPathEFileTimes)
+      SavedEFileChecks = QueryConfigKey( KeyPathEFileChecks)
+
+      --------------------------------
       -- 1) Check if .E file exists
       do once1 = 1 to 1
@@ -690 +695 @@
       enddo  -- once1
 
+      --------------------------------
       -- 2) Compare current .EX file with Netlabs .EX file and delete it if equal
       do once2 = 1 to 1
@@ -770 +776 @@
                   if fCurExFileWasLinked >= 0 then
                      -- unlink works only if EX file exists
-                     'unlink' CurExFile
+                     'Unlink' CurExFile
                      fRelinkUnlinked = 1
                   endif
@@ -798 +804 @@
                   if fCurExFileWasLinked >= 0 | fRelinkUnlinked then  -- < 0 means error or not linked
                      if not fRelinkUnlinked  then  -- maybe already unlinked
-                        'unlink' CurExFile
+                        'Unlink' CurExFile
                         if rc then
                            cError = cError + 1
@@ -804 +810 @@
                         endif
                      endif
-                     'link' BaseName
+                     'Link' BaseName
                      if rc >= 0 then
                         cRelink = cRelink + 1
@@ -826 +832 @@
                WriteBasenameLog( LogFile, Basename, fHeaderWritten, '   is older than and different from Netlabs .EX file')
             elseif CurExFileTime > NetlabsExFileTime then
-               cWarning = cWarning + 1
                WriteBasenameLog( LogFile, Basename, fHeaderWritten, 'I  current .EX file "'CurExFile'"')
                WriteBasenameLog( LogFile, Basename, fHeaderWritten, '   is newer than and different from Netlabs .EX file')
@@ -834 +839 @@
       enddo  -- once2
 
+      --------------------------------
       -- 3) Compare current .EX file with myepm .EX file if Netlabs .EX file doesn't exist
       do once3 = 1 to 1
@@ -840 +846 @@
          endif
 
-         -- Ensure that Netlabs .EX file doesn't exists
+         -- Ensure that Netlabs .EX file doesn't exist
          NetlabsExFile = NepmdRootDir'\netlabs\ex\'BaseName'.ex'
          if Exist( NetlabsExFile) then
@@ -861 +867 @@
          CurExFileTime = NepmdQueryPathInfo( CurExFile, 'MTIME')
          if not rc then
-            next = QueryConfigKey( KeyPathTime)
-            if next <> CurExFileTime then
+            SavedExFileTime = QueryConfigKey( KeyPathTime)
+            if SavedExFileTime <> CurExFileTime then
                fCompExFile = 1
             endif
@@ -869 +875 @@
       enddo  -- once3
 
+      --------------------------------
       -- 4) Check .E files and compare current .E files with Netlabs .E files or with last check
       do once4 = 1 to 1
@@ -878 +885 @@
             leave
          endif
-
-         -- Get list of EFiles from NEPMD.INI
-         SavedEFiles = QueryConfigKey( KeyPathEFiles)
-         -- Get list of times for EFiles from NEPMD.INI
-         SavedEFileTimes = QueryConfigKey( KeyPathEFileTimes)
-         -- Get list of check results for EFiles from NEPMD.INI
-         SavedEFileChecks = QueryConfigKey( KeyPathEFileChecks)
 
          if SavedEFiles = '' then
@@ -925 +925 @@
                -- Get full pathname
                FullEFile = NepmdSearchPath( EFile, 'EPMMACROPATH')
-
                if FullEFile = '' then
                   -- EFile doesn't exist
@@ -1004 +1003 @@
       enddo  -- once4
 
+      --------------------------------
       -- 5) Run Etpm and compare compiled .E files with Netlabs .E files
       do once5 = 1 to 1
@@ -1039 +1039 @@
          endif
 
+         -- Check E files here (after etpm) if not already done in 4)
+         fEFilesDone = (NewEFiles <> '')
+
          NewEFiles = GetEtpmFilesFromLog( EtpmLogFile)
-         SavedEFiles      = QueryConfigKey( KeyPathEFiles)
-         SavedEFileTimes  = QueryConfigKey( KeyPathEFileTimes)
-         SavedEFileChecks = QueryConfigKey( KeyPathEFileChecks)
          erest = NewEFiles
          frest = SavedEFiles
@@ -1050 +1050 @@
          NewEFileChecks = ''
          do while erest <> ''
+            -- Already processed, no need to check them here again
+            if fEFilesDone then
+               leave
+            endif
+
             -- For every EFile...
             parse value erest with EFile';'erest
-/**/
-            -- Check E files here (after etpm) if not already done above
-            if SavedEFiles <> '' then
-               iterate
-            endif
-/**/
             parse value frest with SavedEFile';'frest
             if EFile = SavedEFile then
@@ -1140 +1139 @@
       enddo  -- once5
 
+      --------------------------------
       -- 6) Compare .EX files
       do once6 = 1 to 1
@@ -1196 +1196 @@
 
          elseif next = 0 then  -- equal
+/**/
             WriteBasenameLog( LogFile, Basename, fHeaderWritten, 'I  .EX file "'ExFile'"')
             WriteBasenameLog( LogFile, Basename, fHeaderWritten, '   is equal to current .EX file')
-
+/**/
          else                  -- error
             cError = cError + 1
@@ -1206 +1207 @@
       enddo  -- once6
 
+      --------------------------------
       -- Don't unlink, delete or copy if Checkonly is active
       if fReplaceExFile = 1 & not fCheckOnly then
@@ -1300 +1302 @@
             endif
          endif
-         if NewEFiles <> '' then
+         if NewEFiles <> '' & NewEFileTimes <> '' & NewEFileChecks <> '' then
             DeleteConfigKey( KeyPathEFiles)
             DeleteConfigKey( KeyPathEFileTimes)