Author: hbelusca Date: Fri Aug 11 11:31:46 2017 New Revision: 75526
URL: http://svn.reactos.org/svn/reactos?rev=75526&view=rev Log: [USETUP]: Move the files in ./interface/ back into the main directory, since (almost) all of the usetup source files concerns the user interface of the setup program...
Added: branches/setup_improvements/base/setup/usetup/consup.c - copied, changed from r75525, branches/setup_improvements/base/setup/usetup/interface/consup.c branches/setup_improvements/base/setup/usetup/consup.h - copied, changed from r75525, branches/setup_improvements/base/setup/usetup/interface/consup.h branches/setup_improvements/base/setup/usetup/devinst.c - copied, changed from r75525, branches/setup_improvements/base/setup/usetup/interface/devinst.c branches/setup_improvements/base/setup/usetup/usetup.c - copied, changed from r75525, branches/setup_improvements/base/setup/usetup/interface/usetup.c Removed: branches/setup_improvements/base/setup/usetup/interface/ Modified: branches/setup_improvements/base/setup/usetup/CMakeLists.txt branches/setup_improvements/base/setup/usetup/usetup.h
Modified: branches/setup_improvements/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/CMakeLists.txt [iso-8859-1] Fri Aug 11 11:31:46 2017 @@ -10,9 +10,6 @@ ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers)
list(APPEND SOURCE - interface/usetup.c - interface/devinst.c - interface/consup.c native/console.c native/keytrans.c native/host_native.c @@ -20,6 +17,8 @@ cabinet.c chkdsk.c cmdcons.c + consup.c + devinst.c filesup.c filequeue.c format.c @@ -30,6 +29,7 @@ partlist.c progress.c settings.c + usetup.c usetup.h)
if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
Copied: branches/setup_improvements/base/setup/usetup/consup.c (from r75525, branches/setup_improvements/base/setup/usetup/interface/consup.c) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/consup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/consup.c [iso-8859-1] Fri Aug 11 11:31:46 2017 @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/interface/consup.c + * FILE: base/setup/usetup/consup.c * PURPOSE: Console support functions * PROGRAMMER: Eric Kohl */
Copied: branches/setup_improvements/base/setup/usetup/consup.h (from r75525, branches/setup_improvements/base/setup/usetup/interface/consup.h) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/consup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/consup.h [iso-8859-1] Fri Aug 11 11:31:46 2017 @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/interface/consup.h + * FILE: base/setup/usetup/consup.h * PURPOSE: Console support functions * PROGRAMMER: Eric Kohl */
Copied: branches/setup_improvements/base/setup/usetup/devinst.c (from r75525, branches/setup_improvements/base/setup/usetup/interface/devinst.c) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/devinst.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/devinst.c [iso-8859-1] Fri Aug 11 11:31:46 2017 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/interface/devinst.c + * FILE: base/setup/usetup/devinst.c * PURPOSE: Device installation * PROGRAMMER: Hervé Poussineau (hpoussin@reactos.org) */
Copied: branches/setup_improvements/base/setup/usetup/usetup.c (from r75525, branches/setup_improvements/base/setup/usetup/interface/usetup.c) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] Fri Aug 11 11:31:46 2017 @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/interface/usetup.c + * FILE: base/setup/usetup/usetup.c * PURPOSE: Text-mode setup * PROGRAMMER: Eric Kohl * Casper S. Hornstrup (chorns@users.sourceforge.net)
Modified: branches/setup_improvements/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] Fri Aug 11 11:31:46 2017 @@ -59,7 +59,7 @@ // #include "errorcode.h"
/* Internal Headers */ -#include "interface/consup.h" +#include "consup.h" #include "inffile.h" #include "progress.h" #ifdef __REACTOS__