[0.4.11] Backport: more flexibility for placing inf files

Main goal of this backport is to be able to place infs outside of media/inf and instead next to their (drivers) implementation.

Specifically this ports back:

0.4.15-dev-8227-g 32d615fc10 [DD] Keep the network drivers infs 8.3 like on MS Windows (#7007)

0.4.15-dev-2763-g 6924b8ff39 [NE2000] Combine two INF files into one for ISA and PCI cards

0.4.15-dev-122-g f4e37f9363 [CMAKE] Support file lists in add_cd_file for all cases. Addendum to 6b48d54

0.4.15-dev-121-g 6b48d54c39 [CMAKE] Fix driver inf files generation for livecd CORE-16975. Addendum to 019f21e

partially 0.4.15-dev-52-g 019f21ee1d [MEDIA][CMAKE] Create add_driver_inf cmake function
*.inf files for drivers can now be placed along with the driver code
Left out for now the moving of cdrom.inf, disk.inf, fdc.inf and usbstor.inf (because there are *_new for those due to the new storage stack)

- I compiled that for testing with RosBE2.1.6 GCCwin4.7.2 dbg+rls, MSVC2010dbg+rls, and for all 4 configs I created bootcd, livecd, hybridcd and bootcdregtest on each release-branch.
  All of them succeeded and all files were placed where they belong within the isos.
- I also tested installing with releases/0.4.14 bootcd onto a BTRFS partition, and then accessing that partition from a releases/0.4.7 livecd. Worked.

drivers/bus/acpi/CMakeLists.txt

@@ -203,6 +203,7 @@ target_link_libraries(acpi wdmguid acpica memcmp strtol ${PSEH_LIB})
 add_importlibs(acpi ntoskrnl hal)
 add_pch(acpi precomp.h ACPI_SOURCE)
 add_cd_file(TARGET acpi DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_driver_inf(acpi acpi.inf)
 
 add_subdirectory(cmbatt)
 add_subdirectory(compbatt)

drivers/network/dd/ne2000/CMakeLists.txt

@@ -11,3 +11,4 @@ add_pch(ne2000 include/ne2000.h SOURCE)
 set_module_type(ne2000 kernelmodedriver)
 add_importlibs(ne2000 ndis ntoskrnl hal)
 add_cd_file(TARGET ne2000 DESTINATION reactos/system32/drivers FOR all)
+add_driver_inf(ne2000 netne.inf)

drivers/network/dd/ne2000/netne.inf

@@ -1,6 +1,6 @@
-; NETRTPNT.INF
+; NETNE.INF
 
-; Installation file for 8029 compatible netcards
+; Installation file for NE2000-compatible network cards
 
 [Version]
 Signature  = "$Windows NT$"
@@ -9,20 +9,31 @@ LayoutFile = layout.inf
 Class      = Net
 ClassGUID  = {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider   = %ReactOS%
-DriverVer  = 02/15/2007,1.01
+DriverVer  = 02/15/2007,1.02
 
 [DestinationDirs]
 DefaultDestDir = 12
 
 [Manufacturer]
+%GenericMfg% = GenericMfg
 %RealtekMfg% = RealtekMfg
 
+[GenericMfg]
+%*PNP80D6.DeviceDesc% = NE2000_Inst_Isa.ndi,*PNP80D6
+
 [RealtekMfg]
-%PCI\VEN_10EC&DEV_8029.DeviceDesc% = NE2000_Inst.ndi,PCI\VEN_10EC&DEV_8029
+%*RTL8019.DeviceDesc% = NE2000_Inst_Isa.ndi,*RTL8019
+%PCI\VEN_10EC&DEV_8029.DeviceDesc% = NE2000_Inst_Pci.ndi,PCI\VEN_10EC&DEV_8029
 
 ;---------------------------- NE2000 DRIVER -----------------------------
 
-[NE2000_Inst.ndi.NT]
+[NE2000_Inst_Isa.ndi.NT]
+Characteristics = 0x4 ; NCF_PHYSICAL
+BusType = 14 ; PNPIsaBus
+AddReg = NE2000_AddReg.NT
+CopyFiles = NE2000_CopyFiles.NT
+
+[NE2000_Inst_Pci.ndi.NT]
 Characteristics = 0x4 ; NCF_PHYSICAL
 BusType = 5 ; PCIBus
 AddReg = NE2000_AddReg.NT
@@ -31,12 +42,14 @@ CopyFiles = NE2000_CopyFiles.NT
 [NE2000_AddReg.NT]
 HKR,,Port,0x00000000,"c100"
 HKR,,Irq,0x00000000,"B"
-HKR,,NetworkAddress,0x00000000,"001122334455"
 
 [NE2000_CopyFiles.NT]
 ne2000.sys
 
-[NE2000_Inst.ndi.NT.Services]
+[NE2000_Inst_Isa.ndi.NT.Services]
+AddService = ne2000, 0x00000002, ne2000_Service_Inst
+
+[NE2000_Inst_Pci.ndi.NT.Services]
 AddService = ne2000, 0x00000002, ne2000_Service_Inst
 
 [ne2000_Service_Inst]
@@ -51,5 +64,5 @@ LoadOrderGroup = NDIS
 [Strings]
 ReactOS = "ReactOS Team"
 
-RealtekMfg = "Realtek Semiconductor Co., Ltd."
-PCI\VEN_10EC&DEV_8029.DeviceDesc = "RTL-8029(AS)"
+GenericMfg = "(Generic network cards)"
+*PNP80D6.DeviceDesc = "NE2000 compatible"

drivers/network/dd/pcnet/CMakeLists.txt

@@ -15,3 +15,4 @@ add_pch(pcnet pcnet.h SOURCE)
 set_module_type(pcnet kernelmodedriver)
 add_importlibs(pcnet ndis ntoskrnl hal)
 add_cd_file(TARGET pcnet DESTINATION reactos/system32/drivers FOR all)
+add_driver_inf(pcnet netamd.inf)

drivers/network/dd/rtl8139/CMakeLists.txt

@@ -16,3 +16,4 @@ add_pch(rtl8139 nic.h SOURCE)
 set_module_type(rtl8139 kernelmodedriver)
 add_importlibs(rtl8139 ndis ntoskrnl hal)
 add_cd_file(TARGET rtl8139 DESTINATION reactos/system32/drivers FOR all)
+add_driver_inf(rtl8139 netrtl.inf)

drivers/processor/processr/CMakeLists.txt

@@ -10,3 +10,4 @@ set_module_type(processr kernelmodedriver)
 add_importlibs(processr hal ntoskrnl)
 add_pch(processr processr.h SOURCE)
 add_cd_file(TARGET processr DESTINATION reactos/system32/drivers FOR all)
+add_driver_inf(processr cpu.inf)

drivers/wdm/audio/hdaudbus/CMakeLists.txt

@@ -15,3 +15,4 @@ set_module_type(hdaudbus kernelmodedriver)
 target_link_libraries(hdaudbus libcntpr ${PSEH_LIB})
 add_importlibs(hdaudbus ntoskrnl hal)
 add_cd_file(TARGET hdaudbus DESTINATION reactos/system32/drivers FOR all)
+add_driver_inf(hdaudbus hdaudbus.inf)

media/inf/CMakeLists.txt

@@ -1,19 +1,16 @@
 
 list(APPEND INF_FILES
-    acpi.inf
     audio.inf
     battery.inf
     bda.inf
     bth.inf
     c_image.inf
     cdrom.inf
-    cpu.inf
     disk.inf
     display.inf
     fdc.inf
     flpydisk.inf
     hal.inf
-    hdaudbus.inf
     hdc.inf
     input.inf
     keyboard.inf
@@ -24,10 +21,6 @@ list(APPEND INF_FILES
     monitor.inf
     msmouse.inf
     NET_NIC.inf
-    netamd.inf
-    netisa.inf
-    netrtl.inf
-    netrtpnt.inf
     nettcpip.inf
     ports.inf
     scsi.inf
@@ -37,8 +30,7 @@ list(APPEND INF_FILES
     usbport.inf
     usbstor.inf
     wdmaudio.inf
-    wmiacpi.inf
-    xboxdisp.inf)
+    wmiacpi.inf)
 
 list(APPEND UTF8_INF_FILES
     defltws.inf
@@ -46,17 +38,8 @@ list(APPEND UTF8_INF_FILES
     intl.inf
     layout.inf)
 
-foreach(item ${INF_FILES})
-    set(_converted_item ${CMAKE_CURRENT_BINARY_DIR}/${item})
-    set(_source_item ${CMAKE_CURRENT_SOURCE_DIR}/${item})
-    add_custom_command(OUTPUT "${_converted_item}"
-                       COMMAND native-utf16le "${_source_item}" "${_converted_item}"
-                       DEPENDS native-utf16le "${_source_item}")
-    add_cd_file(TARGET converted_inf_files FILE ${_converted_item} DESTINATION reactos/inf FOR all)
-    list(APPEND _converted_inf_files ${_converted_item})
-endforeach(item)
-
-add_custom_target(converted_inf_files DEPENDS ${_converted_inf_files})
+# module name is used for a custom target creation, so we can put any unique name here
+add_driver_inf(media_inf ${INF_FILES})
 
 foreach(item ${UTF8_INF_FILES})
     add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/inf FOR all)

media/inf/netisa.inf

@@ -1,111 +0,0 @@
-; NETISA.INF
-
-; Installation file for ISA network cards
-
-[Version]
-Signature  = "$Windows NT$"
-;Signature  = "$ReactOS$"
-LayoutFile = layout.inf
-Class      = Net
-ClassGUID  = {4D36E972-E325-11CE-BFC1-08002BE10318}
-Provider   = %ReactOS%
-DriverVer  = 02/15/2007,1.02
-
-[DestinationDirs]
-DefaultDestDir = 12
-
-[Manufacturer]
-%GenericMfg% = GenericMfg
-
-[GenericMfg]
-%*PNP80D6.DeviceDesc% = NE2000_Inst.ndi,*PNP80D6
-
-;---------------------------- NE2000 DRIVER -----------------------------
-
-[NE2000_Inst.ndi.NT]
-Characteristics = 0x4 ; NCF_PHYSICAL
-BusType = 14 ; PNPIsaBus
-AddReg = NE2000_AddReg.NT
-CopyFiles = NE2000_CopyFiles.NT
-
-[NE2000_AddReg.NT]
-HKR,,Port,0x00000000,"c100"
-HKR,,Irq,0x00000000,"B"
-HKR,,NetworkAddress,0x00000000,"001122334455"
-
-[NE2000_CopyFiles.NT]
-ne2000.sys
-
-[NE2000_Inst.ndi.NT.Services]
-AddService = ne2000, 0x00000002, ne2000_Service_Inst
-
-[ne2000_Service_Inst]
-ServiceType   = 1
-StartType     = 3
-ErrorControl  = 1
-ServiceBinary = %12%\ne2000.sys
-LoadOrderGroup = NDIS
-
-;-------------------------------- STRINGS -------------------------------
-
-[Strings]
-ReactOS = "ReactOS Team"
-
-GenericMfg = "(Generic network cards)"
-*PNP80D6.DeviceDesc = "NE2000 Compatible"
-
-[Strings.0405]
-GenericMfg = "(Generické síťové karty)"
-*PNP80D6.DeviceDesc = "NE2000 kompatibilní síťová karta"
-
-[Strings.0407]
-GenericMfg = "(Generische Netzwerkkarten)"
-*PNP80D6.DeviceDesc = "NE2000 kompatible Netzwerkkarte"
-
-[Strings.0a]
-GenericMfg = "(Tarjeta de red estándar)"
-*PNP80D6.DeviceDesc = "Compatible con NE2000"
-
-[Strings.040C]
-GenericMfg = "(Cartes réseau génériques)"
-*PNP80D6.DeviceDesc = "Carte réseau compatible NE2000"
-
-[Strings.0411]
-GenericMfg = "(標準 ネットワーク カード)"
-*PNP80D6.DeviceDesc = "NE2000 互換"
-
-[Strings.0415]
-GenericMfg = "(Standardowe karty sieciowe)"
-*PNP80D6.DeviceDesc = "Kompatybilna z NE2000"
-
-[Strings.0416]
-GenericMfg = "(Adaptadores de rede padrão)"
-*PNP80D6.DeviceDesc = "Compatível com NE2000"
-
-[Strings.0418]
-GenericMfg = "(placă de rețea generică)"
-*PNP80D6.DeviceDesc = "Compatibile cu NE2000"
-
-[Strings.0419]
-GenericMfg = "(Стандартные сетевые адаптеры)"
-*PNP80D6.DeviceDesc = "NE2000-совместимые"
-
-[Strings.041B]
-GenericMfg = "(Generické sieťové karty)"
-*PNP80D6.DeviceDesc = "NE2000 kompatibilná sieťová karta"
-
-[Strings.041f]
-GenericMfg = "(Umûmî Ağ Kartları)"
-*PNP80D6.DeviceDesc = "NE2000 Uyumlu"
-
-[Strings.0422]
-GenericMfg = "(Стандартні мережеві адаптери)"
-*PNP80D6.DeviceDesc = "NE2000-сумісні"
-
-[Strings.0427]
-GenericMfg = "(Standartinės tinklo plokštės)"
-*PNP80D6.DeviceDesc = "Su NE2000 suderinama tinklo plokštė"
-
-[Strings.0804]
-GenericMfg = "(通用网卡)"
-*PNP80D6.DeviceDesc = "NE2000 兼容"

sdk/cmake/CMakeMacros.cmake

@@ -356,15 +356,19 @@ function(add_cd_file)
                 add_dependencies(bootcd ${_CD_TARGET} registry_inf)
             endif()
         else()
-            # add it in reactos.cab
             dir_to_num(${_CD_DESTINATION} _num)
-            file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.cmake "\"${_CD_FILE}\" ${_num}\n")
+            foreach(item ${_CD_FILE})
+                # add it in reactos.cab
+                file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.cmake "\"${item}\" ${_num}\n")
+
+                # manage dependency - file level
+                set_property(GLOBAL APPEND PROPERTY REACTOS_CAB_DEPENDS ${item})
+            endforeach()
+
             # manage dependency - target level
             if(_CD_TARGET)
                 add_dependencies(reactos_cab_inf ${_CD_TARGET})
             endif()
-            # manage dependency - file level
-            set_property(GLOBAL APPEND PROPERTY REACTOS_CAB_DEPENDS ${_CD_FILE})
         endif()
     endif() #end bootcd
 
@@ -622,7 +626,7 @@ function(set_module_type MODULE TYPE)
     endif()
 
     # Set the PE image version numbers from the NT OS version ReactOS is based on
-    if (MSVC)
+    if(MSVC)
         add_target_link_flags(${MODULE} "/VERSION:5.01")
     else()
         add_target_link_flags(${MODULE} "-Wl,--major-image-version,5 -Wl,--minor-image-version,01")
@@ -877,6 +881,21 @@ function(create_registry_hives)
 
 endfunction()
 
+function(add_driver_inf _module)
+    # Add to the inf files list
+    foreach(_file ${ARGN})
+        set(_converted_item ${CMAKE_CURRENT_BINARY_DIR}/${_file})
+        set(_source_item ${CMAKE_CURRENT_SOURCE_DIR}/${_file})
+        add_custom_command(OUTPUT "${_converted_item}"
+                           COMMAND native-utf16le "${_source_item}" "${_converted_item}"
+                           DEPENDS native-utf16le "${_source_item}")
+        list(APPEND _converted_inf_files ${_converted_item})
+    endforeach()
+
+    add_custom_target(${_module}_inf_files DEPENDS ${_converted_inf_files})
+    add_cd_file(FILE ${_converted_inf_files} TARGET ${_module}_inf_files DESTINATION reactos/inf FOR all)
+endfunction()
+
 if(KDBG)
     set(ROSSYM_LIB "rossym")
 else()

win32ss/drivers/miniport/xboxvmp/CMakeLists.txt

@@ -2,3 +2,4 @@
 add_library(xboxvmp SHARED xboxvmp.c xboxvmp.rc)
 set_module_type(xboxvmp kernelmodedriver)
 add_importlibs(xboxvmp ntoskrnl videoprt)
+add_driver_inf(xboxvmp xboxdisp.inf)