Очередной рефакторинг работы с путями

cad_source/components/zebase/uzbpaths.pas

@@ -35,7 +35,7 @@ interface
   TDataFilesExistChecFunc=function(const ACheckedPath:string):boolean;
 
 //подстановка макросов в APath
-function ExpandPath(APath:String;AItDirectory:boolean=false):String;
+function ExpandPath(APath:String):String;
 
 //поиск файла по списку путей разделенных ';'
 function FindInPaths(const APaths:String; const AFileName:String):String;
@@ -130,7 +130,8 @@ function GetSupportPaths:String;
     if SupportPaths='' then
       result:=AdditionalSupportPaths
     else
-      if SupportPaths[Length(SupportPaths)]=DirectorySeparator then
+      if (SupportPaths[Length(SupportPaths)]=';')or
+         (AdditionalSupportPaths[1]=';') then
         result:=SupportPaths+AdditionalSupportPaths
       else
         result:=SupportPaths+';'+AdditionalSupportPaths
@@ -222,30 +223,33 @@ function FindInPaths(const APaths:String; const AFileName:String):String;
   repeat
     GetPartOfPath(ts,s,';');
     zTraceLn('[FILEOPS]FindInPaths: searh in "%s"',[UTF8ToSys(ts)]);
-    ts2:=ts+ExpandedFileName;
+    ts2:=ConcatPaths([ts,ExpandedFileName]);
     if FileExists(UTF8ToSys(ts2))then begin
-      zTraceLn(cFindInPaths,[UTF8ToSys(result)]);
+      zTraceLn(cFindInPaths,[UTF8ToSys(ts2)]);
       exit(ts2);
     end;
    {$IFDEF LINUX}
-    ts2:=ts+lfn;
-    if FileExists(ts2) then
+    ts2:=ConcatPaths([ts,lfn]);
+    if FileExists(ts2) then begin
+      zTraceLn(cFindInPaths,[UTF8ToSys(ts2)]);
       exit(ts2);
+    end;
    {$ENDIF}
   until s='';
   result:='';
   zDebugLn(sysutils.Format('{E}FindInPaths: file not found:"%s"',[UTF8ToSys(ExpandedFileName)]));
 end;
-function ExpandPath(APath:String;AItDirectory:boolean=false):String;
+function ExpandPath(APath:String):String;
 begin
   DefaultMacros.SubstituteMacros(APath);
   if APath='' then
     result:=DistroPath
   else
     result:=APath;
+  DoDirSeparators(result);
   result:=StringReplace(result,'/',PathDelim,[rfReplaceAll, rfIgnoreCase]);
-  if AItDirectory or DirectoryExists(UTF8ToSys(result)) then
-    result:=IncludeTrailingPathDelimiter(result);
+  {if AItDirectory or DirectoryExists(UTF8ToSys(result)) then
+    result:=IncludeTrailingPathDelimiter(result);}
 end;
 
 procedure FromDirIteratorInternal(const path,mask,firstloadfilename:String;proc:TFromDirIterator;method:TFromDirIteratorObj;pdata:pointer;pvs:PTZctnrVectorStrings);
@@ -270,7 +274,7 @@ procedure FromDirIteratorInternal(const path,mask,firstloadfilename:String;proc:
 begin
   zTraceLn('{D+}[FILEOPS]FromDirIteratorInternal start');
   if firstloadfilename<>'' then
-    if fileexists(path+firstloadfilename) then
+    if fileexists(ConcatPaths([path,firstloadfilename])) then
       processfile(firstloadfilename);
   if FindFirst(IncludeTrailingPathDelimiter(path)+'*', faDirectory, sr) = 0 then begin
     repeat
@@ -348,8 +352,8 @@ function FindDistroPath(const CF:TDataFilesExistChecFunc):string;
   end;
 end;
 initialization
-  BinPath:=SysToUTF8(ExtractFilePath(paramstr(0)));
-  DistroPath:=IncludeTrailingPathDelimiter(SysToUTF8(ExpandFileName(ExtractFilePath(paramstr(0))+'../..')));
-  WriteDataPath:=IncludeTrailingPathDelimiter(GetAppConfigDir(false));
-  TempPath:=IncludeTrailingPathDelimiter(GetTempDir);
+  BinPath:=ExtractFilePath(paramstr(0));
+  DistroPath:=ExpandFileName(ExtractFilePath(paramstr(0))+'../..');
+  WriteDataPath:=GetAppConfigDir(false);
+  TempPath:=GetTempDir;
 end.

cad_source/zcad.pas

@@ -323,7 +323,7 @@
   lpsh:=LPS.StartLongProcess('Start program',@lpsh,0);
 {$IFDEF REPORTMMEMORYLEAKS}printleakedblock:=true;{$ENDIF}
 {$IFDEF REPORTMMEMORYLEAKS}
-       SetHeapTraceOutput(sysvar.PATH.Program_Run^+'/log/memory-heaptrace.txt');
+       SetHeapTraceOutput(ConcatPaths([GetTempPath,'/log/memory-heaptrace.txt']));
        keepreleased:=true;
 {$ENDIF}
   //Application_Initialize перемещен в инициализацию uzcfsplash чтоб показать сплэш пораньше
@@ -352,7 +352,7 @@
 
   ZCADMainWindow.SwithToProcessBar;
 
-  FromDirsIterator(sysvar.PATH.Preload_Path^,'*.cmd','autorun.cmd',RunCmdFile,nil);
+  FromDirsIterator(sysvar.PATH.Preload_Paths^,'*.cmd','autorun.cmd',RunCmdFile,nil);
   if CommandLineParser.HasOption(RunScript)then
     for i:=0 to CommandLineParser.OptionOperandsCount(RunScript)-1 do begin
       scrfile:=CommandLineParser.OptionOperand(RunScript,i);

cad_source/zcad/commands/uzccommand_dwgnew.pas

@@ -93,8 +93,8 @@ function DWGNew_com(const Context:TZCADCommandContext;operands:TCommandOperands)
   ZCADMainWindow.PageControl.ActivePage:=TabSheet;
 
   if not fileexists(FileName) then begin
-    FileName:=expandpath(sysvar.PATH.Template_Path^,true)+sysvar.PATH.Template_File^;
-    if fileExists(utf8tosys(FileName)) then
+    FileName:=ConcatPaths([ExpandPath(sysvar.PATH.Template_Path^),ExpandPath(sysvar.PATH.Template_File^)]);
+    if fileExists(UTF8ToSys(FileName)) then
       Load_merge(FileName,TLOLoad)
     else
       ZCMsgCallBackInterface.TextMessage(format(rsTemplateNotFound,[FileName]),TMWOShowError);

cad_source/zcad/commands/uzccommand_lpcsrun.pas

@@ -46,8 +46,8 @@ function LPCSRun_com(const Context:TZCADCommandContext;operands:TCommandOperands
 initialization
   programlog.LogOutFormatStr('Unit "%s" initialization',[{$INCLUDE %FILE%}],LM_Info,UnitsInitializeLMId);
   CommandScriptsManager:=STManager.CreateType('lpcs','Command script',TCurrentDrawingContext,[ttest.testadder,ttest.setCurrentDrawing]);
-  if sysvar.PATH.Preload_Path<>nil then
-    CommandScriptsManager.ScanDirs(sysvar.PATH.Preload_Path^);
+  if sysvar.PATH.Preload_Paths<>nil then
+    CommandScriptsManager.ScanDirs(ExpandPath(sysvar.PATH.Preload_Paths^));
   CreateZCADCommand(@LPCSRun_com,'LPCSRun',0,0);
 finalization
   ProgramLog.LogOutFormatStr('Unit "%s" finalization',[{$INCLUDE %FILE%}],LM_Info,UnitsFinalizeLMId);

cad_source/zcad/commands/uzccommandsmanager.pas

@@ -155,13 +155,13 @@ implementation
 function GDBcommandmanager.MacroFuncsCurrentMacrosPath (const {%H-}Param: string; const Data: PtrInt;
                                                         var {%H-}Abort: boolean): string;
 begin
-  result:=ExtractFilePath(currMacros);
+  result:=ExcludeTrailingPathDelimiter(ExtractFilePath(currMacros));
 end;
 
 function GDBcommandmanager.MacroFuncsCurrentMacrosFile (const {%H-}Param: string; const Data: PtrInt;
                                                         var {%H-}Abort: boolean): string;
 begin
-  result:=ExtractFileName(currMacros);
+  result:=ExcludeTrailingPathDelimiter(ExtractFileName(currMacros));
 end;
 
 procedure GDBcommandmanager.AddClPrompt(CLP:ICommandLinePrompt);

cad_source/zcad/entities/uzcextdrreport.pas

@@ -161,8 +161,8 @@ procedure TReportExtender.ScrContextSet(mode:TLapeScriptContextModes;ctx:TBaseSc
 initialization
   //extdrAdd(extdrReport)
   ReportScriptsManager:=STManager.CreateType('lpr','Script test',TEntityExtentionContext,[ttest.testadder]);
-  if sysvar.PATH.Preload_Path<>nil then
-    ReportScriptsManager.ScanDirs(sysvar.PATH.Preload_Path^);
+  if sysvar.PATH.Preload_Paths<>nil then
+    ReportScriptsManager.ScanDirs(sysvar.PATH.Preload_Paths^);
   temp:=ReportScriptsManager.CreateExternalScriptData('test',TEntityExtentionContext,[ttest.testadder]);
   //ReportScriptsManager.RunScript(temp);
   //ReportScriptsManager.RunScript('test');

cad_source/zcad/gui/forms/uzcfsplash.pas

@@ -71,7 +71,7 @@ procedure TSplashForm.AfterConstruction;
   self.DoubleBuffered:=true;
   Logo:=TImage.create(self);
   Logo.Align:=alclient;
-  flogo:=ConcatPaths([UTF8ToSys(GetDistroPath),CFScomponentsDir,CFSlogopngFile]);
+  flogo:=ConcatPaths([GetDistroPath,CFScomponentsDir,CFSlogopngFile]);
   if FileExists(flogo) then
     Logo.Picture.LoadFromFile(flogo);
   Logo.Parent:=self;

cad_source/zcad/gui/uzcmainwindow.pas

@@ -1064,7 +1064,7 @@ procedure TZCADMainWindow._onCreate(Sender: TObject);
   toolbars.Sorted:=true;
   CreateInterfaceLists;
 
-  FromDirsIterator(sysvar.PATH.Preload_Path^,'*.cmd0','stage0.cmd0',RunCmdFile,nil);
+  FromDirsIterator(sysvar.PATH.Preload_Paths^,'*.cmd0','stage0.cmd0',RunCmdFile,nil);
 
   CreateAnchorDockingInterface;
   ZCMsgCallBackInterface.Do_GUIaction(nil,ZMsgID_GUIActionRedraw);

cad_source/zcad/register/uzcregfontmanager.pas

@@ -37,7 +37,7 @@ initialization
   sysvar.RD.RD_UseLazFreeTypeImplementation:=@sysvarTTFUseLazFreeTypeImplementation;
   {$ELSE}
   {$ENDIF}
-  sysvar.PATH.Fonts_Path:=@sysvarPATHFontsPath;
+  sysvar.PATH.Fonts_Paths:=@sysvarPATHFontsPath;
   sysvar.PATH.Alternate_Font:=@sysvarAlternateFont;
 finalization
   ProgramLog.LogOutFormatStr('Unit "%s" finalization',[{$INCLUDE %FILE%}],LM_Info,UnitsFinalizeLMId);

cad_source/zcad/register/uzcregother.pas

@@ -181,23 +181,23 @@ initialization;
   //s:=SysVar.PATH.device_library^;
   //SysVarUnit.AssignToSymbol(SysVar.PATH.Program_Data,'PATH_Program_Run');
   //s:=SysVar.PATH.Program_Data^;
-  //SysVarUnit.AssignToSymbol(SysVar.PATH.Support_Path,'PATH_Support_Path');
-  //s:=SysVar.PATH.Support_Path^;
+  //SysVarUnit.AssignToSymbol(SysVar.PATH.Support_Paths,'PATH_Support_Path');
+  //s:=SysVar.PATH.Support_Paths^;
 
   SysVarUnit.AssignToSymbol(SysVar.PATH.Template_Path,'PATH_Template_Path');
   //s:=SysVar.PATH.Template_Path^;
   SysVarUnit.AssignToSymbol(SysVar.PATH.Template_File,'PATH_Template_File');
   //s:=SysVar.PATH.Template_File^;
 
-  SysVarUnit.AssignToSymbol(SysVar.PATH.Preload_Path,'PATH_Preload_Path');
+  SysVarUnit.AssignToSymbol(SysVar.PATH.Preload_Paths,'PATH_Preload_Path');
 
   SysVarUnit.AssignToSymbol(SysVar.PATH.LayoutFile,'PATH_LayoutFile');
 
-  //SysVarUnit.AssignToSymbol(SysVar.PATH.Fonts_Path,'PATH_Fonts');
+  //SysVarUnit.AssignToSymbol(SysVar.PATH.Fonts_Paths,'PATH_Fonts');
 
   //sysvar.RD.RD_LastRenderTime^:=0;
   //sysvar.PATH.Program_Data^:=sysparam.programpath;
-  //sysvar.PATH.Temp_files:=@temppath;
+  //sysvar.PATH.Temp_Path:=@temppath;
   if sysvar.SYS.SYS_Version<>nil then
     sysvar.SYS.SYS_Version^:=sysparam.notsaved.ver.versionstring;
   end;

cad_source/zcad/register/uzcregpaths.pas

@@ -28,9 +28,9 @@ initialization
   units.CreateExtenalSystemVariable(SysVarUnit,SysVarN,GetSupportPaths,expandpath('$(DistroPath)/rtl/system.pas'),InterfaceTranslate,'PATH_Support_Path','String',@SupportPaths);
   sysvar.PATH.Dictionaries:[email protected];
   sysvar.PATH.Program_Data:=@GetDistroPath;
-  sysvar.PATH.Support_Path:=@SupportPaths;
-  sysvar.PATH.AdditionalSupport_Path:=@GetAdditionalSupportPaths;
-  sysvar.PATH.Temp_files:=@GetTempPath;
+  sysvar.PATH.Support_Paths:=@SupportPaths;
+  sysvar.PATH.AdditionalSupport_Paths:=@GetAdditionalSupportPaths;
+  sysvar.PATH.Temp_Path:=@GetTempPath;
 finalization
   ProgramLog.LogOutFormatStr('Unit "%s" finalization',[{$INCLUDE %FILE%}],LM_Info,UnitsFinalizeLMId);
 end.

cad_source/zcad/uzcpathmacros.pas

@@ -111,7 +111,8 @@ class function TZCADPathsMacroMethods.MacroFuncEnv(const Param: string; const Da
 class function TZCADPathsMacroMethods.MacroFuncDataSearhPrefixes(const {%H-}Param: string; const Data: PtrInt;
                                    var {%H-}Abort: boolean): string;
 begin
-  Result:=IncludeTrailingPathDelimiter(IncludeTrailingPathDelimiter(GetAppConfigDir(false))+Param)+';'+IncludeTrailingPathDelimiter(IncludeTrailingPathDelimiter(GetDistroPath)+Param);
+  //Result:=IncludeTrailingPathDelimiter(IncludeTrailingPathDelimiter(GetAppConfigDir(false))+Param)+';'+IncludeTrailingPathDelimiter(IncludeTrailingPathDelimiter(GetDistroPath)+Param);
+  Result:=ConcatPaths([GetAppConfigDir(false),Param])+';'+ConcatPaths([GetDistroPath,Param]);
 end;
 class function TZCADPathsMacroMethods.MacroFuncUserDir(const Param: string; const {%H-}Data: PtrInt;var {%H-}Abort: boolean): string;
 begin

cad_source/zcad/uzcsysvars.pas

@@ -59,17 +59,17 @@   tdebug=record
         end;
   {REGISTERRECORDTYPE tpath}
   tpath=record
-             Support_Path:PString;(*'Support files'*)
-             AdditionalSupport_Path:TFString;(*'Additional support files'*)(*oi_readonly*)
-             Preload_Path:PString;(*'Preload files'*)
-             Fonts_Path:PString;(*'Fonts'*)
+             Support_Paths:PString;(*'Support files'*)
+             AdditionalSupport_Paths:TFString;(*'Additional support files'*)(*oi_readonly*)
+             Preload_Paths:PString;(*'Preload files'*)
+             Fonts_Paths:PString;(*'Fonts'*)
              Alternate_Font:PString;(*'Alternate font file'*)
              Template_Path:PString;(*'Templates'*)
              Template_File:PString;(*'Default template'*)
              LayoutFile:PString;(*'Current layout'*)
              Dictionaries:PString;(*'Dictionaries'*)
              Program_Data:TFString;(*'Program data'*)(*oi_readonly*)
-             Temp_files:TFString;(*'Temporary files'*)(*oi_readonly*)
+             Temp_Path:TFString;(*'Temporary files'*)(*oi_readonly*)
              Device_Library:PString;(*'Device base'*)
         end;
   PTCanvasData=^TCanvasData;

cad_source/zengine/fonts/uzefontmanager.pas

@@ -163,34 +163,34 @@ constructor GDBFontManager.init;
   inherited init(m);
 end;
 procedure GDBFontManager.CreateBaseFont;
+var
+  PathWithFileName:string;
 {NEEDFIXFORDELPHI}
 {$IFNDEF DELPHI}
-var
-   r: TLResource;
-   f:TZctnrVectorBytes;
+  r:TLResource;
+  f:TZctnrVectorBytes;
 {$ENDIF}
 const
-   resname='GEWIND';
-   filename='GEWIND.SHX';
+  resname='GEWIND';
+  filename='GEWIND.SHX';
 begin
   {$IFNDEF DELPHI}
   pbasefont:=addFonfByFile(FindInPaths(sysvarPATHFontsPath,sysvarAlternateFont));
-  if pbasefont=nil then
-  begin
-       zDebugLn('{E}'+rsAlternateFontNotFoundIn,[sysvarAlternateFont,sysvarPATHFontsPath]);
-       r := LazarusResources.Find(resname);
-       if r = nil then
-                      zDebugLn('{F}'+rsReserveFontNotFound)
-                  else
-                      begin
-                           f.init(length(r.Value));
-                           f.AddData(@r.Value[1],length(r.Value));
-                           f.SaveToFile(expandpath(GetTempPath+filename));
-                           pbasefont:=addFonfByFile(GetTempPath+filename);
-                           f.done;
-                           if pbasefont=nil then
-                                                zDebugLn('{F}'+rsReserveFontNotLoad)
-                      end;
+  if pbasefont=nil then begin
+    zDebugLn('{E}'+rsAlternateFontNotFoundIn,[sysvarAlternateFont,sysvarPATHFontsPath]);
+    r := LazarusResources.Find(resname);
+    if r = nil then
+      zDebugLn('{F}'+rsReserveFontNotFound)
+    else begin
+      f.init(length(r.Value));
+      f.AddData(@r.Value[1],length(r.Value));
+      PathWithFileName:=expandpath(ConcatPaths([GetTempPath,filename]));
+      f.SaveToFile(PathWithFileName);
+      pbasefont:=addFonfByFile(PathWithFileName);
+      f.done;
+      if pbasefont=nil then
+        zDebugLn('{F}'+rsReserveFontNotLoad)
+    end;
   end;
   addFonfByFile(FindInPaths(sysvarPATHFontsPath,'ltypeshp.shx'));
   {$ENDIF}

environment/runtimefiles/common/rtl/sysvar.pas

@@ -156,8 +156,8 @@ implementation
   DSGN_OTrackTimerInterval:=500;
   DISP_LWDisplayScale:=10;
   RD_Light:=False;
-  PATH_Preload_Path:='$(DistroPath)/preload/;$(UserDir)/zcad/preload/;$(LocalConfigDir)/$(AppName)/preload/;$(GlobalConfigDir)/$(AppName)/preload/';
-  PATH_Fonts:='$(SystemFontsPath)/;$(UserFontsPath)/;$(DistroPath)/fonts/;C:/APPS/MY/acad/support/;C:/Program Files/Autodesk/AutoCAD 2020/Fonts/';
+  PATH_Preload_Path:='$(DistroPath)/preload;$(UserDir)/zcad/preload;$(LocalConfigDir)/$(AppName)/preload;$(GlobalConfigDir)/$(AppName)/preload';
+  PATH_Fonts:='$(SystemFontsPath);$(UserFontsPath);$(DistroPath)/fonts;C:/APPS/MY/acad/support;C:/Program Files/Autodesk/AutoCAD 2020/Fonts';
   PATH_AlternateFont:='_mipGost.shx';
   PATH_Support_Path:='$DataSearhPrefixes(rtl);$DataSearhPrefixes(rtl/objdefunits);$DataSearhPrefixes(rtl/objdefunits/include);$DataSearhPrefixes(components);$DataSearhPrefixes(blocks/el/general);$DataSearhPrefixes(blocks/el/general/velecdevice)';
   INTF_CommandLineEnabled:=True;

environment/runtimefiles/zcadelectrotech/preload/lowcurrentnetworks/lowcurrentnetworks.cmd

@@ -1,3 +1,3 @@
-MergeBlocks($(CurrentMacrosPath)callingpanels$(DirectorySeparator)_callpanels.dxf)
-MergeBlocks($(CurrentMacrosPath)controlbuttons$(DirectorySeparator)_controlbuttons.dxf)
-MergeBlocks($(CurrentMacrosPath)networkequipment$(DirectorySeparator)_networkequipment.dxf)
+MergeBlocks($(CurrentMacrosPath)$(DirectorySeparator)callingpanels$(DirectorySeparator)_callpanels.dxf)
+MergeBlocks($(CurrentMacrosPath)$(DirectorySeparator)controlbuttons$(DirectorySeparator)_controlbuttons.dxf)
+MergeBlocks($(CurrentMacrosPath)$(DirectorySeparator)networkequipment$(DirectorySeparator)_networkequipment.dxf)

environment/runtimefiles/zcadelectrotech/preload/lowcurrentnetworks/lowcurrentnetworks.cmd0

@@ -1,5 +1,5 @@
 cfgAddSupportPath($(CurrentMacrosPath))
-cfgAddSupportPath($(CurrentMacrosPath)callingpanels)
-cfgAddSupportPath($(CurrentMacrosPath)controlbuttons)
-cfgAddSupportPath($(CurrentMacrosPath)networkequipment)
-LoadPalettes($(CurrentMacrosPath)lowcurrentnetworks.xml)
+cfgAddSupportPath($(CurrentMacrosPath)$(DirectorySeparator)callingpanels)
+cfgAddSupportPath($(CurrentMacrosPath)$(DirectorySeparator)controlbuttons)
+cfgAddSupportPath($(CurrentMacrosPath)$(DirectorySeparator)networkequipment)
+LoadPalettes($(CurrentMacrosPath)$(DirectorySeparator)lowcurrentnetworks.xml)

environment/runtimefiles/zcadelectrotech/preload/schematic/schematic.cmd0

@@ -1,4 +1,4 @@
 cfgAddSupportPath($(CurrentMacrosPath))
-cfgAddSupportPath($(CurrentMacrosPath)rtl)
-cfgAddSupportPath($(CurrentMacrosPath)rtl$(DirectorySeparator)include)
+cfgAddSupportPath($(CurrentMacrosPath)$(DirectorySeparator)rtl)
+cfgAddSupportPath($(CurrentMacrosPath)$(DirectorySeparator)rtl$(DirectorySeparator)include)
 LoadPalettes($(CurrentMacrosPath)$(DirectorySeparator)schematic.xml)

environment/runtimefiles/zcadelectrotech/preload/slinetypeline/slinetypeline.cmd

@@ -1 +1 @@
-MergeBlocks($(CurrentMacrosPath)_slinetypeline.dxf)
+MergeBlocks($(CurrentMacrosPath)$(DirectorySeparator)_slinetypeline.dxf)

environment/runtimefiles/zcadelectrotech/preload/velectrical/velectrical.cmd

@@ -1,7 +1,7 @@
-MergeBlocks($(CurrentMacrosPath)schemes$(DirectorySeparator)_vschemes.dxf)
-MergeBlocks($(CurrentMacrosPath)schemes$(DirectorySeparator)_vschemesugo.dxf)
-MergeBlocks($(CurrentMacrosPath)plan$(DirectorySeparator)sockets$(DirectorySeparator)_vsockets.dxf)
-MergeBlocks($(CurrentMacrosPath)plan$(DirectorySeparator)shields$(DirectorySeparator)_vshields.dxf)
-MergeBlocks($(CurrentMacrosPath)plan$(DirectorySeparator)elreceiver$(DirectorySeparator)_elreceiver.dxf)
-MergeBlocks($(CurrentMacrosPath)plan$(DirectorySeparator)lighting$(DirectorySeparator)_lighting.dxf)
+MergeBlocks($(CurrentMacrosPath)$(DirectorySeparator)schemes$(DirectorySeparator)_vschemes.dxf)
+MergeBlocks($(CurrentMacrosPath)$(DirectorySeparator)schemes$(DirectorySeparator)_vschemesugo.dxf)
+MergeBlocks($(CurrentMacrosPath)$(DirectorySeparator)plan$(DirectorySeparator)sockets$(DirectorySeparator)_vsockets.dxf)
+MergeBlocks($(CurrentMacrosPath)$(DirectorySeparator)plan$(DirectorySeparator)shields$(DirectorySeparator)_vshields.dxf)
+MergeBlocks($(CurrentMacrosPath)$(DirectorySeparator)plan$(DirectorySeparator)elreceiver$(DirectorySeparator)_elreceiver.dxf)
+MergeBlocks($(CurrentMacrosPath)$(DirectorySeparator)plan$(DirectorySeparator)lighting$(DirectorySeparator)_lighting.dxf)
 

environment/runtimefiles/zcadelectrotech/preload/velectrical/velectrical.cmd0

@@ -1,7 +1,7 @@
 cfgAddSupportPath($(CurrentMacrosPath))
-cfgAddSupportPath($(CurrentMacrosPath)schemes)
-cfgAddSupportPath($(CurrentMacrosPath)plan$(DirectorySeparator)sockets)
-cfgAddSupportPath($(CurrentMacrosPath)plan$(DirectorySeparator)shields)
-cfgAddSupportPath($(CurrentMacrosPath)plan$(DirectorySeparator)elreceiver)
-cfgAddSupportPath($(CurrentMacrosPath)plan$(DirectorySeparator)lighting)
-LoadPalettes($(CurrentMacrosPath)velectrical.xml)
+cfgAddSupportPath($(CurrentMacrosPath)$(DirectorySeparator)schemes)
+cfgAddSupportPath($(CurrentMacrosPath)$(DirectorySeparator)plan$(DirectorySeparator)sockets)
+cfgAddSupportPath($(CurrentMacrosPath)$(DirectorySeparator)plan$(DirectorySeparator)shields)
+cfgAddSupportPath($(CurrentMacrosPath)$(DirectorySeparator)plan$(DirectorySeparator)elreceiver)
+cfgAddSupportPath($(CurrentMacrosPath)$(DirectorySeparator)plan$(DirectorySeparator)lighting)
+LoadPalettes($(CurrentMacrosPath)$(DirectorySeparator)velectrical.xml)