[simspark-svn] SF.net SVN: simspark:[49] trunk

[<he...@us...>]

Revision: 49
          http://simspark.svn.sourceforge.net/simspark/?rev=49&view=rev
Author:   hedayat
Date:     2009-02-12 08:15:05 +0000 (Thu, 12 Feb 2009)

Log Message:
-----------
Fixes in make uninstall:
- Remove all symbolic links
- Remove installed directories 

Modified Paths:
--------------
    trunk/rcssserver3d/cmake_uninstall.cmake.in
    trunk/rsgedit/cmake_uninstall.cmake.in
    trunk/simspark-utilities/cmake_uninstall.cmake.in
    trunk/spark/cmake_uninstall.cmake.in

Modified: trunk/rcssserver3d/cmake_uninstall.cmake.in
===================================================================
--- trunk/rcssserver3d/cmake_uninstall.cmake.in	2009-02-10 23:55:23 UTC (rev 48)
+++ trunk/rcssserver3d/cmake_uninstall.cmake.in	2009-02-12 08:15:05 UTC (rev 49)
@@ -17,6 +17,33 @@
     ENDIF(NOT "${rm_retval}" STREQUAL 0)
   ELSE(EXISTS "$ENV{DESTDIR}${file}")
     MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+    # But it might be an invalid symbolic link; so, it might be still there!
+    EXEC_PROGRAM(
+      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval
+      )
   ENDIF(EXISTS "$ENV{DESTDIR}${file}")
 ENDFOREACH(file)
 
+SET(directories "@INCLUDEDIR@/@CMAKE_PROJECT_NAME@"
+                "@LIBDIR@/@CMAKE_PROJECT_NAME@"
+                "@DATADIR@/@CMAKE_PROJECT_NAME@"
+                "@DATADIR@/doc/@CMAKE_PROJECT_NAME@"
+)
+
+FOREACH(dir ${directories})
+  MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+  IF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+    EXEC_PROGRAM(
+      "@CMAKE_COMMAND@" ARGS "-E remove_directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval
+      )
+    IF(NOT "${rm_retval}" STREQUAL 0)
+      MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+    ENDIF(NOT "${rm_retval}" STREQUAL 0)
+  ELSE(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+    MESSAGE(STATUS "Directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\" does not exist.")
+  ENDIF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ENDFOREACH(dir)

Modified: trunk/rsgedit/cmake_uninstall.cmake.in
===================================================================
--- trunk/rsgedit/cmake_uninstall.cmake.in	2009-02-10 23:55:23 UTC (rev 48)
+++ trunk/rsgedit/cmake_uninstall.cmake.in	2009-02-12 08:15:05 UTC (rev 49)
@@ -17,6 +17,33 @@
     ENDIF(NOT "${rm_retval}" STREQUAL 0)
   ELSE(EXISTS "$ENV{DESTDIR}${file}")
     MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+    # But it might be an invalid symbolic link; so, it might be still there!
+    EXEC_PROGRAM(
+      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval
+      )
   ENDIF(EXISTS "$ENV{DESTDIR}${file}")
 ENDFOREACH(file)
 
+SET(directories "@INCLUDEDIR@/@CMAKE_PROJECT_NAME@"
+                "@LIBDIR@/@CMAKE_PROJECT_NAME@"
+                "@DATADIR@/@CMAKE_PROJECT_NAME@"
+                "@DATADIR@/doc/@CMAKE_PROJECT_NAME@"
+)
+
+FOREACH(dir ${directories})
+  MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+  IF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+    EXEC_PROGRAM(
+      "@CMAKE_COMMAND@" ARGS "-E remove_directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval
+      )
+    IF(NOT "${rm_retval}" STREQUAL 0)
+      MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+    ENDIF(NOT "${rm_retval}" STREQUAL 0)
+  ELSE(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+    MESSAGE(STATUS "Directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\" does not exist.")
+  ENDIF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ENDFOREACH(dir)

Modified: trunk/simspark-utilities/cmake_uninstall.cmake.in
===================================================================
--- trunk/simspark-utilities/cmake_uninstall.cmake.in	2009-02-10 23:55:23 UTC (rev 48)
+++ trunk/simspark-utilities/cmake_uninstall.cmake.in	2009-02-12 08:15:05 UTC (rev 49)
@@ -17,6 +17,31 @@
     ENDIF(NOT "${rm_retval}" STREQUAL 0)
   ELSE(EXISTS "$ENV{DESTDIR}${file}")
     MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+    # But it might be an invalid symbolic link; so, it might be still there!
+    EXEC_PROGRAM(
+      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval
+      )
   ENDIF(EXISTS "$ENV{DESTDIR}${file}")
 ENDFOREACH(file)
 
+SET(directories "@DATADIR@/@CMAKE_PROJECT_NAME@"
+                "@DATADIR@/doc/@CMAKE_PROJECT_NAME@"
+)
+
+FOREACH(dir ${directories})
+  MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+  IF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+    EXEC_PROGRAM(
+      "@CMAKE_COMMAND@" ARGS "-E remove_directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval
+      )
+    IF(NOT "${rm_retval}" STREQUAL 0)
+      MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+    ENDIF(NOT "${rm_retval}" STREQUAL 0)
+  ELSE(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+    MESSAGE(STATUS "Directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\" does not exist.")
+  ENDIF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ENDFOREACH(dir)

Modified: trunk/spark/cmake_uninstall.cmake.in
===================================================================
--- trunk/spark/cmake_uninstall.cmake.in	2009-02-10 23:55:23 UTC (rev 48)
+++ trunk/spark/cmake_uninstall.cmake.in	2009-02-12 08:15:05 UTC (rev 49)
@@ -17,6 +17,33 @@
     ENDIF(NOT "${rm_retval}" STREQUAL 0)
   ELSE(EXISTS "$ENV{DESTDIR}${file}")
     MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+    # But it might be an invalid symbolic link; so, it might be still there!
+    EXEC_PROGRAM(
+      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval
+      )
   ENDIF(EXISTS "$ENV{DESTDIR}${file}")
 ENDFOREACH(file)
 
+SET(directories "@INCLUDEDIR@/@CMAKE_PROJECT_NAME@"
+                "@LIBDIR@/@CMAKE_PROJECT_NAME@"
+                "@DATADIR@/@CMAKE_PROJECT_NAME@"
+                "@DATADIR@/doc/@CMAKE_PROJECT_NAME@"
+)
+
+FOREACH(dir ${directories})
+  MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+  IF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+    EXEC_PROGRAM(
+      "@CMAKE_COMMAND@" ARGS "-E remove_directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval
+      )
+    IF(NOT "${rm_retval}" STREQUAL 0)
+      MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\"")
+    ENDIF(NOT "${rm_retval}" STREQUAL 0)
+  ELSE(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+    MESSAGE(STATUS "Directory \"$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}\" does not exist.")
+  ENDIF(EXISTS "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@/${dir}")
+ENDFOREACH(dir)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.