Compile and save VBE modules after importing

Modules need to be saved before other properties can be added, such as custom descriptions and hidden attributes. Fixes #236
joyfullservice · Jun 8, 2021 · 86e2b41 · 86e2b41
1 parent 0137772
commit 86e2b41
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 25 deletions.
diff --git a/Version Control.accda.src/modules/modImportExport.bas b/Version Control.accda.src/modules/modImportExport.bas
@@ -366,12 +366,18 @@ Public Sub Build(strSourceFolder As String, blnFullBuild As Boolean)
             ' Show category wrap-up.
             Log.Add "[" & colFiles.Count & "]" & IIf(Options.ShowDebug, " " & LCase(cCategory.Category) & " processed.", vbNullString)
             Perf.ComponentEnd colFiles.Count
+
+            ' After importing modules, we need to save them before adding
+            ' other properties like descriptions or hidden attributes
+            If cCategory.ComponentType = edbModule Then
+                Perf.OperationStart "Compile/Save Modules"
+                DoCmd.RunCommand acCmdCompileAndSaveAllModules
+                DoEvents
+                Perf.OperationEnd
+            End If
         End If
     Next cCategory
 
-    ' Compile and save the modules after importing as VBE Components
-    CompileAndSaveAllModules
-
     ' Run any post-build/merge instructions
     If blnFullBuild Then
         If Options.RunAfterBuild <> vbNullString Then

diff --git a/Version Control.accda.src/modules/modVCSUtility.bas b/Version Control.accda.src/modules/modVCSUtility.bas
@@ -56,9 +56,9 @@ Public Function GetAllContainers() As Collection
         ' Additional objects to import after ADP/MDB specific items
         .Add New clsDbForm
         .Add New clsDbMacro
-        .Add New clsDbModule
         .Add New clsDbReport
         .Add New clsDbTableData
+        .Add New clsDbModule
         If blnMDB Then
             .Add New clsDbTableDataMacro
             .Add New clsDbRelation
@@ -561,24 +561,3 @@ Public Sub ClearOrphanedSourceFiles(cType As IDbComponent, ParamArray StrExtensi
 
 End Sub
 
-
-'---------------------------------------------------------------------------------------
-' Procedure : CompileAndSaveAllModules
-' Author    : Adam Waller
-' Date      : 5/26/2021
-' Purpose   : Run the command to compile and save all modules in the currentproject.
-'           : NOTE: It is very important that you do not run this in the codeproject
-'           : or you may crash Access.
-'---------------------------------------------------------------------------------------
-'
-Public Sub CompileAndSaveAllModules()
-    If GetVBProjectForCurrentDB.FileName <> VBE.ActiveVBProject.FileName Then
-        ' Make sure the active project is set to the current project so we compile
-        ' and save the current project, not the add-in.
-        Set VBE.ActiveVBProject = GetVBProjectForCurrentDB
-    End If
-    Perf.OperationStart "Compile/Save Modules"
-    DoCmd.RunCommand acCmdCompileAndSaveAllModules
-    DoEvents
-    Perf.OperationEnd
-End Sub