[ros-diffs] [spetreolle] 49235: [CMAKE] Livecd: Add inf files. Temporarily add generated syssetup.inf from trunk.

[spetreolle at svn.reactos.org]

Author: spetreolle
Date: Sat Oct 23 11:35:26 2010
New Revision: 49235

URL: http://svn.reactos.org/svn/reactos?rev=49235&view=rev
Log:
[CMAKE]
Livecd: Add inf files.
Temporarily add generated syssetup.inf from trunk.

Added:
    branches/cmake-bringup/media/inf/CMakeLists.txt
      - copied, changed from r49230, branches/cmake-bringup/media/nls/CMakeLists.txt
    branches/cmake-bringup/media/inf/syssetup.inf.trunk   (with props)
Modified:
    branches/cmake-bringup/CMakeLists.txt
    branches/cmake-bringup/media/CMakeLists.txt

Modified: branches/cmake-bringup/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?rev=49235&r1=49234&r2=49235&view=diff
==============================================================================
--- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sat Oct 23 11:35:26 2010
@@ -127,11 +127,10 @@
 file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/Default User/Desktop")
 file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/Default User/My Documents")
 file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos")
+file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/inf")
 file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/fonts")
 file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/system32")
 file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/system32/config")
-
-
 
 add_custom_command(
     OUTPUT ${REACTOS_BINARY_DIR}/livecd.iso

Modified: branches/cmake-bringup/media/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/CMakeLists.txt?rev=49235&r1=49234&r2=49235&view=diff
==============================================================================
--- branches/cmake-bringup/media/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/media/CMakeLists.txt [iso-8859-1] Sat Oct 23 11:35:26 2010
@@ -1,2 +1,3 @@
 add_subdirectory(fonts)
+add_subdirectory(inf)
 add_subdirectory(nls)

Copied: branches/cmake-bringup/media/inf/CMakeLists.txt (from r49230, branches/cmake-bringup/media/nls/CMakeLists.txt)
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/inf/CMakeLists.txt?p2=branches/cmake-bringup/media/inf/CMakeLists.txt&p1=branches/cmake-bringup/media/nls/CMakeLists.txt&r1=49230&r2=49235&rev=49235&view=diff
==============================================================================
--- branches/cmake-bringup/media/nls/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/media/inf/CMakeLists.txt [iso-8859-1] Sat Oct 23 11:35:26 2010
@@ -1,8 +1,6 @@
-add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/l_intl.nls reactos l_intl.nls)
-add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/c_437.nls reactos c_437.nls)
-add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/c_1252.nls reactos c_1252.nls)
+file(GLOB NLS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.inf")
+foreach(item ${NLS_FILES})
+    add_livecd("${CMAKE_CURRENT_SOURCE_DIR}/${item}" reactos/inf ${item})
+endforeach(item)
 
-file(GLOB NLS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.nls")
-foreach(item ${NLS_FILES})
-    add_livecd("${CMAKE_CURRENT_SOURCE_DIR}/${item}" reactos/system32 ${item})
-endforeach(item)
+add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/syssetup.inf.trunk reactos/inf syssetup.inf)

Added: branches/cmake-bringup/media/inf/syssetup.inf.trunk
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/inf/syssetup.inf.trunk?rev=49235&view=auto
==============================================================================
--- branches/cmake-bringup/media/inf/syssetup.inf.trunk (added)
+++ branches/cmake-bringup/media/inf/syssetup.inf.trunk [iso-8859-1] Sat Oct 23 11:35:26 2010
@@ -1,0 +1,83 @@
+[Version]
+Signature = $Windows NT$
+ClassGUID = {00000000-0000-0000-0000-000000000000}
+
+[DeviceInfsToInstall]
+battery.inf
+cdrom.inf
+display.inf
+fdc.inf
+hdc.inf
+keyboard.inf
+machine.inf
+msmouse.inf
+NET_NIC.inf
+ports.inf
+scsi.inf
+usbport.inf
+audio.inf
+ks.inf
+
+[RegistrationPhase2]
+RegisterDlls = OleControlDlls
+
+[OleControlDlls]
+11,,actxprxy.dll,1
+11,,amstream.dll,1
+11,,atl.dll,1
+11,,avifil32.dll,1
+11,,browseui.dll,1
+11,,comcat.dll,1
+11,,comctl32.dll,2
+11,,cryptdlg.dll,1
+11,,cryptnet.dll,1
+11,,ddraw.dll,1
+11,,devenum.dll,1
+11,,dinput.dll,1
+11,,dinput8.dll,1
+11,,dmusic.dll,1
+11,,dplayx.dll,1
+11,,dsound.dll,1
+11,,dxdiagn.dll,1
+11,,hhctrl.ocx,1
+11,,hlink.dll,1
+11,,hnetcfg.dll,1
+11,,inetcomm.dll,1
+11,,inseng.dll,1
+11,,itss.dll,1
+11,,jscript.dll,1
+11,,ksproxy.ax,1
+11,,mlang.dll,1
+11,,mscat32.dll,1
+11,,msctf.dll,1
+11,,mshtml.dll,3
+11,,msi.dll,1
+11,,msimtf.dll,1
+11,,msisip.dll,1
+11,,mstask.dll,1
+11,,msxml3.dll,1
+11,,netcfgx.dll,1
+11,,netshell.dll,1
+11,,objsel.dll,1
+11,,ole32.dll,1
+11,,oleacc.dll,1
+11,,oleaut32.dll,1
+11,,olepro32.dll,1
+11,,pstorec.dll,1
+11,,qedit.dll,1
+11,,qmgr.dll,1
+11,,qmgrprxy.dll,1
+11,,quartz.dll,1
+11,,rpcrt4.dll,1
+11,,rsabase.dll,1
+11,,rsaenh.dll,1
+11,,shdocvw.dll,3
+11,,shell32.dll,3
+11,,softpub.dll,1
+11,,sti.dll,1
+11,,urlmon.dll,3
+11,,windowscodecs.dll,1
+11,,winhttp.dll,1
+11,,wininet.dll,2
+11,,wintrust.dll,1
+11,,wuapi.dll,1

Propchange: branches/cmake-bringup/media/inf/syssetup.inf.trunk
------------------------------------------------------------------------------
    svn:eol-style = native