Author: hbelusca Date: Wed Sep 28 23:20:20 2016 New Revision: 72846
URL: http://svn.reactos.org/svn/reactos?rev=72846&view=rev Log: [REACTOS]: Do not gather all the generated message resource files in the same directory (sdk/include/reactos/), so that to avoid potential file collisions, but instead place them into their respective per-target directories. CORE-12062 #resolve
[RAPPS_NEW]: Fix rapps_new message header & resource files inclusion.
[ROSTESTS]: Adjust the CMakeLists files in accordance.
Added: trunk/reactos/dll/win32/netevent/netevent.rc - copied unchanged from r72845, trunk/reactos/dll/win32/netevent/netevt.rc Removed: trunk/reactos/dll/win32/netevent/netevt.rc Modified: trunk/reactos/CMakeLists.txt trunk/reactos/base/applications/rapps_new/rapps.h trunk/reactos/base/applications/rapps_new/rapps.rc trunk/reactos/dll/win32/iologmsg/CMakeLists.txt trunk/reactos/dll/win32/netevent/CMakeLists.txt trunk/reactos/sdk/cmake/CMakeMacros.cmake trunk/reactos/sdk/cmake/gcc.cmake trunk/reactos/sdk/cmake/msvc.cmake trunk/rostests/rosautotest/CMakeLists.txt trunk/rostests/win32/advapi32/eventlog/CMakeLists.txt
Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=72846&am... ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -235,6 +235,7 @@ ${REACTOS_BINARY_DIR}/sdk/include/dxsdk ${REACTOS_BINARY_DIR}/sdk/include/ddk ${REACTOS_BINARY_DIR}/sdk/include/reactos + ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc sdk/include/crt sdk/include/ddk sdk/include/ndk
Modified: trunk/reactos/base/applications/rapps_new/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_new... ============================================================================== --- trunk/reactos/base/applications/rapps_new/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/rapps.h [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -24,7 +24,7 @@ #include <strsafe.h> #include <ndk/rtlfuncs.h>
-#include <rappsmsg.h> +#include <rappsmsg_new.h>
#include "resource.h"
Modified: trunk/reactos/base/applications/rapps_new/rapps.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_new... ============================================================================== --- trunk/reactos/base/applications/rapps_new/rapps.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/rapps.rc [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -52,7 +52,7 @@
#include <reactos/manifest_exe.rc>
-#include <rappsmsg.rc> +#include <rappsmsg_new.rc>
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/iologmsg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iologmsg/CMakeLis... ============================================================================== --- trunk/reactos/dll/win32/iologmsg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iologmsg/CMakeLists.txt [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -1,5 +1,4 @@
-include_directories(${REACTOS_BINARY_DIR}/sdk/include/reactos) add_library(iologmsg SHARED iologmsg.rc) set_module_type(iologmsg module UNICODE) add_dependencies(iologmsg ntiologc)
Modified: trunk/reactos/dll/win32/netevent/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netevent/CMakeLis... ============================================================================== --- trunk/reactos/dll/win32/netevent/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netevent/CMakeLists.txt [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -1,6 +1,5 @@
-include_directories(${REACTOS_BINARY_DIR}/sdk/include/reactos) -add_library(netevent SHARED netevt.rc) +add_library(netevent SHARED netevent.rc) set_module_type(netevent module UNICODE) add_dependencies(netevent neteventmsg) add_cd_file(TARGET netevent DESTINATION reactos/system32 FOR all)
Removed: trunk/reactos/dll/win32/netevent/netevt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netevent/netevt.r... ============================================================================== --- trunk/reactos/dll/win32/netevent/netevt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netevent/netevt.rc (removed) @@ -1,7 +0,0 @@ -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Network Event Handler" -#define REACTOS_STR_INTERNAL_NAME "netevent" -#define REACTOS_STR_ORIGINAL_FILENAME "netevent.dll" -#include <reactos/version.rc> - -#include <neteventmsg.rc>
Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/CMakeMacros.cmake... ============================================================================== --- trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -113,23 +113,23 @@ else() set(_flag "-A") endif() - foreach(_in_FILE ${ARGN}) - get_filename_component(FILE ${_in_FILE} NAME_WE) - set(_converted_item ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc/${FILE}.mc) - set(_source_item ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc) + foreach(_file ${ARGN}) + get_filename_component(_file_name ${_file} NAME_WE) + set(_converted_file ${CMAKE_CURRENT_BINARY_DIR}/${_file}) ## ${_file_name}.mc + set(_source_file ${CMAKE_CURRENT_SOURCE_DIR}/${_file}) ## ${_file_name}.mc add_custom_command( - OUTPUT "${_converted_item}" - COMMAND native-utf16le "${_source_item}" "${_converted_item}" "nobom" - DEPENDS native-utf16le "${_source_item}") - macro_mc(${_flag} ${FILE}) + OUTPUT "${_converted_file}" + COMMAND native-utf16le "${_source_file}" "${_converted_file}" nobom + DEPENDS native-utf16le "${_source_file}") + macro_mc(${_flag} ${_converted_file}) add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.rc ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.h - COMMAND ${COMMAND_MC} ${MC_FLAGS} - DEPENDS "${_converted_item}") + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file_name}.h ${CMAKE_CURRENT_BINARY_DIR}/${_file_name}.rc + COMMAND ${COMMAND_MC} + DEPENDS "${_converted_file}") set_source_files_properties( - ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.rc + ${CMAKE_CURRENT_BINARY_DIR}/${_file_name}.h ${CMAKE_CURRENT_BINARY_DIR}/${_file_name}.rc PROPERTIES GENERATED TRUE) - add_custom_target(${FILE} ALL DEPENDS ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.rc) + add_custom_target(${_file_name} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_file_name}.h ${CMAKE_CURRENT_BINARY_DIR}/${_file_name}.rc) endforeach() endfunction()
Modified: trunk/reactos/sdk/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/gcc.cmake?rev=728... ============================================================================== --- trunk/reactos/sdk/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/gcc.cmake [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -379,7 +379,7 @@ endfunction()
macro(macro_mc FLAG FILE) - set(COMMAND_MC ${CMAKE_MC_COMPILER} -u ${FLAG} -b ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc/${FILE}.mc -r ${REACTOS_BINARY_DIR}/sdk/include/reactos -h ${REACTOS_BINARY_DIR}/sdk/include/reactos) + set(COMMAND_MC ${CMAKE_MC_COMPILER} -u ${FLAG} -b -h ${CMAKE_CURRENT_BINARY_DIR}/ -r ${CMAKE_CURRENT_BINARY_DIR}/ ${FILE}) endmacro()
# PSEH lib, needed with mingw
Modified: trunk/reactos/sdk/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/msvc.cmake?rev=72... ============================================================================== --- trunk/reactos/sdk/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/msvc.cmake [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -374,7 +374,7 @@ endfunction()
macro(macro_mc FLAG FILE) - set(COMMAND_MC ${CMAKE_MC_COMPILER} ${FLAG} -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/sdk/include/reactos -h ${REACTOS_BINARY_DIR}/sdk/include/reactos) + set(COMMAND_MC ${CMAKE_MC_COMPILER} -u ${FLAG} -b -h ${CMAKE_CURRENT_BINARY_DIR}/ -r ${CMAKE_CURRENT_BINARY_DIR}/ ${FILE}) endmacro()
# PSEH workaround
Modified: trunk/rostests/rosautotest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CMakeLists.txt... ============================================================================== --- trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -22,7 +22,7 @@ tools.cpp precomp.h)
-add_executable(rosautotest ${SOURCE} ${REACTOS_BINARY_DIR}/sdk/include/reactos/rosautotestmsg.rc) +add_executable(rosautotest ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/rosautotestmsg.rc) set_module_type(rosautotest win32cui UNICODE) add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll) add_pch(rosautotest precomp.h SOURCE)
Modified: trunk/rostests/win32/advapi32/eventlog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/advapi32/eventlog/CM... ============================================================================== --- trunk/rostests/win32/advapi32/eventlog/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/win32/advapi32/eventlog/CMakeLists.txt [iso-8859-1] Wed Sep 28 23:20:20 2016 @@ -3,19 +3,15 @@ ## rc /fo $(IntDir)MyEventProvider.res MyEventProvider.rc ## link /dll /noentry /SUBSYSTEM:CONSOLE",5.0" /out:$(SolutionDir)$(Configuration)\MyEventProvider.dll $(IntDir)MyEventProvider.res
-## add_message_headers(UNICODE MyEventProvider.mc) - -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/MyEventProvider.rc ${CMAKE_CURRENT_BINARY_DIR}/MyEventProvider.h - COMMAND ${CMAKE_MC_COMPILER} -U ${CMAKE_CURRENT_SOURCE_DIR}/MyEventProvider.mc -r ${CMAKE_CURRENT_BINARY_DIR}/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/MyEventProvider.mc) - -add_library(MyEventProvider SHARED ${CMAKE_CURRENT_BINARY_DIR}/MyEventProvider.rc) -set_module_type(MyEventProvider module UNICODE) -add_cd_file(TARGET MyEventProvider DESTINATION reactos/bin FOR all) +add_message_headers(UNICODE MyEventProvider.mc) +add_library(MyEventProvider_dll SHARED ${CMAKE_CURRENT_BINARY_DIR}/MyEventProvider.rc) +add_dependencies(MyEventProvider_dll MyEventProvider) +set_module_type(MyEventProvider_dll module UNICODE) +set_target_properties(MyEventProvider_dll PROPERTIES OUTPUT_NAME "MyEventProvider") +add_cd_file(TARGET MyEventProvider_dll DESTINATION reactos/bin FOR all)
add_executable(evtlogtest EvtLogTest.c) -add_dependencies(evtlogtest MyEventProvider) set_module_type(evtlogtest win32cui UNICODE) +add_dependencies(evtlogtest MyEventProvider MyEventProvider_dll) add_importlibs(evtlogtest advapi32 msvcrt kernel32) add_cd_file(TARGET evtlogtest DESTINATION reactos/bin FOR all)