[pygccxml-commit] SF.net SVN: pygccxml: [1094] installers

[<rom...@us...>]

Revision: 1094
          http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1094&view=rev
Author:   roman_yakovenko
Date:     2007-08-08 23:08:01 -0700 (Wed, 08 Aug 2007)

Log Message:
-----------
updating gccxml installer

Modified Paths:
--------------
    installers/config.py
    installers/install_gccxml.py

Modified: installers/config.py
===================================================================
--- installers/config.py	2007-08-07 19:24:02 UTC (rev 1093)
+++ installers/config.py	2007-08-09 06:08:01 UTC (rev 1094)
@@ -17,8 +17,8 @@
     unzip = None
         
     gccxml_cvs_dir = None
-    cmake_windows = 'cmake-2.4.6-win32-x86.zip'
-    cmake_linux = 'cmake-2.4.6-Linux-i386.tar.gz'
+    cmake_windows = 'cmake-2.4.7-win32-x86.zip'
+    cmake_linux = 'cmake-2.4.7-Linux-i386.tar.gz'
     if 'win32' == sys.platform:
         gccxml_cvs_dir = r'D:\dev\gccxml_cvs\gccxml'
         unzip = 'unzip -d $target_dir $archive' #command line to run in order to unzip the file

Modified: installers/install_gccxml.py
===================================================================
--- installers/install_gccxml.py	2007-08-07 19:24:02 UTC (rev 1093)
+++ installers/install_gccxml.py	2007-08-09 06:08:01 UTC (rev 1094)
@@ -24,9 +24,12 @@
         utils.logger.info( 'GCC_XML build directory "%s" already exists' % build_dir )
         
     if os.path.exists( config.gccxml_install_dir ):
-        utils.rmtree_safe( config.gccxml_install_dir )
+        if os.listdir( config.gccxml_install_dir ) \
+           and 'gccxml' not in os.path.split( config.gccxml_install_dir )[1].lower():
+            utils.logger.info( "GCC_XML install directory '%s' already exists." % config.gccxml_install_dir)
+            config.gccxml_install_dir = os.path.join( config.gccxml_install_dir, 'gccxml' )
     else:
-        utils.logger.info( 'GCC_XML install directory "%s" already exists' % config.gccxml_install_dir)
+        utils.logger.info( "GCC_XML install directory '%s' doesn't exist" % config.gccxml_install_dir)
         
     os.chdir( build_dir )
     cmake = os.path.join( working_dir
@@ -90,7 +93,11 @@
 
     gccxml_cvs_dir_name = os.path.splitext( config.archives.gccxml )[0]
     gccxml_cvs_dir_path = os.path.join( working_dir, gccxml_cvs_dir_name )        
+    
     utils.logger.info( 'coping gccxml directory ' )
+    if os.path.realpath( config.setup_builder.gccxml_cvs_dir ) \
+       != os.path.realpath( gccxml_cvs_dir_path ):
+        utils.rmtree_safe( gccxml_cvs_dir_path )
     shutil.copytree( config.setup_builder.gccxml_cvs_dir, gccxml_cvs_dir_path )
     utils.logger.info( 'coping gccxml directory - done' )
     #TODO: remove cvs files from the directory


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