[ros-diffs] [tkreuzer] 49675: [CMAKE] Bye, bye, winebuild. Welcome spec2def.

Author: tkreuzer
Date: Sat Nov 20 21:43:57 2010
New Revision: 49675

URL: http://svn.reactos.org/svn/reactos?rev=49675&view=rev
Log:
[CMAKE]
Bye, bye, winebuild. Welcome spec2def.

Removed:
    branches/cmake-bringup/tools/winebuild/
Modified:
    branches/cmake-bringup/CMakeLists.txt
    branches/cmake-bringup/CMakeMacros.cmake
    branches/cmake-bringup/gcc.cmake
    branches/cmake-bringup/tools/CMakeLists.txt
    branches/cmake-bringup/tools/spec2def/spec2def.c

Modified: branches/cmake-bringup/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re…
==============================================================================
--- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sat Nov 20 21:43:57 2010
@@ -41,9 +41,9 @@
 add_subdirectory(lib)
 
 if(NOT MSVC)
-export(TARGETS widl winebuild nci buildno gendib cabman cdmake mkhive spec2def geninc
FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+export(TARGETS widl nci buildno gendib cabman cdmake mkhive spec2def geninc FILE
${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
 else()
-export(TARGETS winebuild nci buildno gendib cabman cdmake mkhive spec2def geninc FILE
${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+export(TARGETS nci buildno gendib cabman cdmake mkhive spec2def geninc FILE
${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
 endif()
 
 else()

Modified: branches/cmake-bringup/CMakeMacros.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake…
==============================================================================
--- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Sat Nov 20 21:43:57 2010
@@ -61,7 +61,7 @@
     add_custom_command(
         OUTPUT ${_object_file}
         COMMAND nasm -o ${_object_file} ${result_incs} ${result_defs} -f bin
${_asm_file}
-        DEPENDS native-winebuild)
+        DEPENDS ${_asm_file})
     set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE)
     add_custom_target(${_target_name} ALL DEPENDS ${_object_file})
     add_minicd(${_object_file} loader ${OBJECT_NAME})

Modified: branches/cmake-bringup/gcc.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=496…
==============================================================================
--- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sat Nov 20 21:43:57 2010
@@ -158,10 +158,10 @@
     get_filename_component(_file ${_spec_file} NAME_WE)
     add_custom_command(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
-        COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def --def -E
${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} --filename ${_dllname}
+        COMMAND native-spec2def --dll ${_dllname}
${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
-        PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)
+        PROPERTIES GENERATED TRUE)
 endmacro()
 
 # Optional 3rd parameter: dllname

Modified: branches/cmake-bringup/tools/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.…
==============================================================================
--- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Sat Nov 20 21:43:57 2010
@@ -12,7 +12,6 @@
 add_subdirectory(nci)
 add_subdirectory(spec2def)
 add_subdirectory(unicode)
-add_subdirectory(winebuild)
 if(NOT MSVC)
 #add_subdirectory(rsym)
 add_subdirectory(wpp)

Modified: branches/cmake-bringup/tools/spec2def/spec2def.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp…
==============================================================================
--- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Sat Nov 20 21:43:57
2010
@@ -294,6 +294,12 @@
                     while (*pc > ',') pc++;
                 }
             }
+            else if (CompareToken(pc, "-noname") ||
+                     CompareToken(pc, "-ret64") ||
+                     CompareToken(pc, "-private"))
+            {
+                /* silently ignore these */
+            }
             else
             {
                 fprintf(stderr, "info: ignored option: '%.10s'\n",
pc);
@@ -386,8 +392,6 @@
         OutputLine(fileDest, &exp);
     }
 
-printf("done\n");
-
     return 0;
 }