Skip to content

Commit d43e0d9

Browse files
asarhaddonasarhaddon
committed
project: replace some disjonctions with string concatenations
1 parent 0e8be5c commit d43e0d9

File tree

2 files changed

+43
-85
lines changed

2 files changed

+43
-85
lines changed

‎gnatcoll.gpr

+43-85
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ project GnatColl is
4242
type OS_Kind is ("windows", "unix", "osx");
4343
OS : OS_Kind := External ("GNATCOLL_OS", "unix");
4444

45-
Sources := ("src", "src/os", "src/paragraph_filling");
46-
45+
Unix_Win32 := "";
4746
case OS is
4847
when "unix" | "osx" =>
49-
Sources := Sources & ("src/os/unix");
48+
Unix_Win32 := "unix";
5049
when "windows" =>
51-
Sources := Sources & ("src/os/win32");
50+
Unix_Win32 := "win32";
5251
end case;
5352

54-
for Source_Dirs use Sources;
53+
for Source_Dirs use
54+
("src", "src/os", "src/paragraph_filling", "src/os/" & Unix_Win32);
5555

5656
for Library_Kind use Library_Type;
5757

@@ -174,86 +174,44 @@ project GnatColl is
174174
for Implementation ("GNATCOLL.OS.FS.Open_Pipe")
175175
use "gnatcoll-os-fs-open_pipe__" & OS & ".adb";
176176

177-
case OS is
178-
when "unix" | "osx" =>
179-
for Specification ("GNATCOLL.Mmap.System")
180-
use "gnatcoll-mmap-system__unix.ads";
181-
for Implementation ("GNATCOLL.Mmap.System")
182-
use "gnatcoll-mmap-system__unix.adb";
183-
for Implementation ("GNATCOLL.IO.Native.Codec")
184-
use "gnatcoll-io-native-codec__unix.adb";
185-
for Implementation ("GNATCOLL.Plugins")
186-
use "gnatcoll-plugins__unix.adb";
187-
for Implementation ("GNATCOLL.OS.Stat.Stat")
188-
use "gnatcoll-os-stat-stat__unix.adb";
189-
for Implementation ("GNATCOLL.OS.FS.Null_File")
190-
use "gnatcoll-os-fs-null_file__unix.adb";
191-
for Implementation ("GNATCOLL.OS.FS.Open")
192-
use "gnatcoll-os-fs-open__unix.adb";
193-
for Implementation ("GNATCOLL.OS.FS.Set_Close_On_Exec")
194-
use "gnatcoll-os-fs-set_close_on_exec__unix.adb";
195-
for Implementation ("GNATCOLL.OS.FS.Is_Console")
196-
use "gnatcoll-os-fs-is_console__unix.adb";
197-
for Implementation ("GNATCOLL.OS.Process.Wait")
198-
use "gnatcoll-os-process-wait__unix.adb";
199-
for Implementation ("GNATCOLL.OS.Process.Internal_Spawn")
200-
use "gnatcoll-os-process-internal_spawn__unix.adb";
201-
for Specification ("GNATCOLL.OS.Process_Types")
202-
use "gnatcoll-os-process_types__unix.ads";
203-
for Implementation ("GNATCOLL.OS.Process_Types")
204-
use "gnatcoll-os-process_types__unix.adb";
205-
for Implementation ("GNATCOLL.OS.Process.State")
206-
use "gnatcoll-os-process-state__unix.adb";
207-
for Implementation ("GNATCOLL.OS.Process.Wait_For_Processes")
208-
use "gnatcoll-os-process-wait_for_processes__unix.adb";
209-
for Specification ("GNATCOLL.OS.Dir_Types")
210-
use "gnatcoll-os-dir_types__unix.ads";
211-
for Implementation ("GNATCOLL.OS.Dir.Open")
212-
use "gnatcoll-os-dir-open__unix.adb";
213-
for Implementation ("GNATCOLL.OS.Dir.Close")
214-
use "gnatcoll-os-dir-close__unix.adb";
215-
for Implementation ("GNATCOLL.OS.Dir.Read")
216-
use "gnatcoll-os-dir-read__unix.adb";
217-
when "windows" =>
218-
for Specification ("GNATCOLL.Mmap.System")
219-
use "gnatcoll-mmap-system__win32.ads";
220-
for Implementation ("GNATCOLL.Mmap.System")
221-
use "gnatcoll-mmap-system__win32.adb";
222-
for Implementation ("GNATCOLL.IO.Native.Codec")
223-
use "gnatcoll-io-native-codec__win32.adb";
224-
for Implementation ("GNATCOLL.Plugins")
225-
use "gnatcoll-plugins__windows.adb";
226-
for Implementation ("GNATCOLL.OS.Stat.Stat")
227-
use "gnatcoll-os-stat-stat__win32.adb";
228-
for Implementation ("GNATCOLL.OS.FS.Is_Console")
229-
use "gnatcoll-os-fs-is_console__win32.adb";
230-
for Implementation ("GNATCOLL.OS.FS.Null_File")
231-
use "gnatcoll-os-fs-null_file__win32.adb";
232-
for Implementation ("GNATCOLL.OS.FS.Open")
233-
use "gnatcoll-os-fs-open__win32.adb";
234-
for Implementation ("GNATCOLL.OS.FS.Set_Close_On_Exec")
235-
use "gnatcoll-os-fs-set_close_on_exec__win32.adb";
236-
for Specification ("GNATCOLL.OS.Process_Types")
237-
use "gnatcoll-os-process_types__win32.ads";
238-
for Implementation ("GNATCOLL.OS.Process_Types")
239-
use "gnatcoll-os-process_types__win32.adb";
240-
for Implementation ("GNATCOLL.OS.Process.Wait")
241-
use "gnatcoll-os-process-wait__win32.adb";
242-
for Implementation ("GNATCOLL.OS.Process.Internal_Spawn")
243-
use "gnatcoll-os-process-internal_spawn__win32.adb";
244-
for Implementation ("GNATCOLL.OS.Process.State")
245-
use "gnatcoll-os-process-state__win32.adb";
246-
for Implementation ("GNATCOLL.OS.Process.Wait_For_Processes")
247-
use "gnatcoll-os-process-wait_for_processes__win32.adb";
248-
for Specification ("GNATCOLL.OS.Dir_Types")
249-
use "gnatcoll-os-dir_types__win32.ads";
250-
for Implementation ("GNATCOLL.OS.Dir.Open")
251-
use "gnatcoll-os-dir-open__win32.adb";
252-
for Implementation ("GNATCOLL.OS.Dir.Close")
253-
use "gnatcoll-os-dir-close__win32.adb";
254-
for Implementation ("GNATCOLL.OS.Dir.Read")
255-
use "gnatcoll-os-dir-read__win32.adb";
256-
end case;
177+
for Specification ("GNATCOLL.Mmap.System")
178+
use "gnatcoll-mmap-system__" & Unix_Win32 & ".ads";
179+
for Implementation ("GNATCOLL.Mmap.System")
180+
use "gnatcoll-mmap-system__" & Unix_Win32 & ".adb";
181+
for Implementation ("GNATCOLL.IO.Native.Codec")
182+
use "gnatcoll-io-native-codec__" & Unix_Win32 & ".adb";
183+
for Implementation ("GNATCOLL.Plugins")
184+
use "gnatcoll-plugins__" & Unix_Win32 & ".adb";
185+
for Implementation ("GNATCOLL.OS.Stat.Stat")
186+
use "gnatcoll-os-stat-stat__" & Unix_Win32 & ".adb";
187+
for Implementation ("GNATCOLL.OS.FS.Null_File")
188+
use "gnatcoll-os-fs-null_file__" & Unix_Win32 & ".adb";
189+
for Implementation ("GNATCOLL.OS.FS.Open")
190+
use "gnatcoll-os-fs-open__" & Unix_Win32 & ".adb";
191+
for Implementation ("GNATCOLL.OS.FS.Set_Close_On_Exec")
192+
use "gnatcoll-os-fs-set_close_on_exec__" & Unix_Win32 & ".adb";
193+
for Implementation ("GNATCOLL.OS.FS.Is_Console")
194+
use "gnatcoll-os-fs-is_console__" & Unix_Win32 & ".adb";
195+
for Implementation ("GNATCOLL.OS.Process.Wait")
196+
use "gnatcoll-os-process-wait__" & Unix_Win32 & ".adb";
197+
for Implementation ("GNATCOLL.OS.Process.Internal_Spawn")
198+
use "gnatcoll-os-process-internal_spawn__" & Unix_Win32 & ".adb";
199+
for Specification ("GNATCOLL.OS.Process_Types")
200+
use "gnatcoll-os-process_types__" & Unix_Win32 & ".ads";
201+
for Implementation ("GNATCOLL.OS.Process_Types")
202+
use "gnatcoll-os-process_types__" & Unix_Win32 & ".adb";
203+
for Implementation ("GNATCOLL.OS.Process.State")
204+
use "gnatcoll-os-process-state__" & Unix_Win32 & ".adb";
205+
for Implementation ("GNATCOLL.OS.Process.Wait_For_Processes")
206+
use "gnatcoll-os-process-wait_for_processes__" & Unix_Win32 & ".adb";
207+
for Specification ("GNATCOLL.OS.Dir_Types")
208+
use "gnatcoll-os-dir_types__" & Unix_Win32 & ".ads";
209+
for Implementation ("GNATCOLL.OS.Dir.Open")
210+
use "gnatcoll-os-dir-open__" & Unix_Win32 & ".adb";
211+
for Implementation ("GNATCOLL.OS.Dir.Close")
212+
use "gnatcoll-os-dir-close__" & Unix_Win32 & ".adb";
213+
for Implementation ("GNATCOLL.OS.Dir.Read")
214+
use "gnatcoll-os-dir-read__" & Unix_Win32 & ".adb";
257215

258216
case OS is
259217
when "unix" | "osx" =>

‎src/gnatcoll-plugins__windows.adb renamed to ‎src/gnatcoll-plugins__win32.adb

File renamed without changes.

0 commit comments

Comments
 (0)