X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2Fvirtual_salome.py;h=4891ea5e30eb6c10eda252d5c3cfe2ab9af44326;hb=17f89acccd51b2d2c86d44e70a1c053c10da0b3d;hp=cf577713b84ad0ed70da9f41460b76dd66974612;hpb=48d150b078ab63d77fbed4de1f8dbd7d3a8767da;p=modules%2Fkernel.git diff --git a/bin/virtual_salome.py b/bin/virtual_salome.py old mode 100644 new mode 100755 index cf577713b..4891ea5e3 --- a/bin/virtual_salome.py +++ b/bin/virtual_salome.py @@ -1,5 +1,5 @@ -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +#! /usr/bin/env python3 +# Copyright (C) 2007-2024 CEA, EDF, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -20,7 +20,6 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # - """Create a virtual Salome installation Based on a script created by Ian Bicking. @@ -32,7 +31,9 @@ Typical use:: install module KERNEL in the current directory """ -import sys, os, optparse, shutil,glob,fnmatch +import sys, os, optparse, shutil, glob, fnmatch + + py_version = 'python%s.%s' % (sys.version_info[0], sys.version_info[1]) verbose=0 @@ -43,11 +44,11 @@ def mkdir(path): """Create a directory and all the intermediate directories if path does not exist""" if not os.path.exists(path): if verbose: - print 'Creating %s' % path + print('Creating %s' % path) os.makedirs(path) else: if verbose: - print 'Directory %s already exists' % path + print('Directory %s already exists' % path) pass pass @@ -57,15 +58,15 @@ def symlink(src, dest): """Create a link if it does not exist""" if not os.path.exists(dest): if os.path.lexists(dest): - print "Do not create symlink %s. It already exists but it's broken" % dest + print("Do not create symlink %s. It already exists but it's broken" % dest) return if verbose: - print 'Creating symlink %s' % dest + print('Creating symlink %s' % dest) pass - os.symlink(src, dest) + os.symlink(os.path.relpath(src,os.path.dirname(dest)), dest) else: if verbose: - print 'Symlink %s already exists' % dest + print('Symlink %s already exists' % dest) pass pass @@ -74,11 +75,11 @@ def symlink(src, dest): def rmtree(dir): """Remove (recursive) a directory if it exists""" if os.path.exists(dir): - print 'Deleting tree %s' % dir + print('Deleting tree %s' % dir) shutil.rmtree(dir) else: if verbose: - print 'Do not need to delete %s; already gone' % dir + print('Do not need to delete %s; already gone' % dir) pass pass pass @@ -98,13 +99,13 @@ def get_lib_dir(): def link_module(options): global verbose - if not options.module: - print "Option module is mandatory" + if not options.module_path: + print("Option module is mandatory") return - module_dir=os.path.abspath(options.module) + module_dir=os.path.abspath(options.module_path) if not os.path.exists(module_dir): - print "Module %s does not exist" % module_dir + print("Module %s does not exist" % module_dir) return verbose = options.verbose @@ -127,12 +128,14 @@ def link_module(options): pyversio=versio else: #incompatible python versions - print "incompatible python versions : application has version %s and module %s has not" % (versio,module_dir) + print("incompatible python versions : application has version %s and module %s has not" % (versio,module_dir)) return module_bin_dir=os.path.join(module_dir,'bin','salome') + module_test_dir=os.path.join(module_dir,'bin','salome', 'test') module_idl_dir=os.path.join(module_dir,'idl','salome') module_lib_dir=os.path.join(module_dir,get_lib_dir(),'salome') + module_pvlib_dir=os.path.join(module_dir,get_lib_dir(),'paraview') module_lib_py_dir=os.path.join(module_dir,get_lib_dir(),pyversio,'site-packages','salome') module_lib_py_shared_dir=os.path.join(module_dir,get_lib_dir(),pyversio, 'site-packages','salome') @@ -144,10 +147,13 @@ def link_module(options): module_sharedoc_gui_dir=os.path.join(module_dir,'share','doc','salome','gui') module_sharedoc_tui_dir=os.path.join(module_dir,'share','doc','salome','tui') module_sharedoc_examples=os.path.join(module_dir,'share','doc','salome','examples') + module_sharedoc_dev=os.path.join(module_dir,'share','doc','salome','dev') bin_dir=os.path.join(home_dir,'bin','salome') + test_dir=os.path.join(home_dir,'bin','salome', 'test') idl_dir=os.path.join(home_dir,'idl','salome') lib_dir=os.path.join(home_dir,'lib','salome') + pvlib_dir=os.path.join(home_dir,'lib','paraview') lib_py_dir=os.path.join(home_dir,'lib',pyversio,'site-packages','salome') lib_py_shared_dir=os.path.join(home_dir,'lib',pyversio, 'site-packages','salome') @@ -159,9 +165,11 @@ def link_module(options): sharedoc_gui_dir=os.path.join(home_dir,'share','doc','salome','gui') sharedoc_tui_dir=os.path.join(home_dir,'share','doc','salome','tui') sharedoc_examples_dir=os.path.join(home_dir,'share','doc','salome','examples') + sharedoc_dev_dir=os.path.join(home_dir,'share','doc','salome','dev') if options.clear: rmtree(bin_dir) + rmtree(test_dir) rmtree(idl_dir) rmtree(lib_dir) rmtree(lib_py_dir) @@ -173,13 +181,29 @@ def link_module(options): #directory bin/salome : create it and link content if os.path.exists(module_bin_dir): mkdir(bin_dir) + mkdir(test_dir) for fn in os.listdir(module_bin_dir): - symlink(os.path.join(module_bin_dir, fn), os.path.join(bin_dir, fn)) + if fn != "test": + symlink(os.path.join(module_bin_dir, fn), os.path.join(bin_dir, fn)) pass pass else: if verbose: - print module_bin_dir, " doesn't exist" + print(module_bin_dir, " doesn't exist") + pass + + #directory bin/salome/test : create it and link content + if os.path.exists(module_test_dir): + # link /bin/salome/test/ to /bin/salome/test + print("link %s --> %s"%(os.path.join(test_dir, options.module_name), module_test_dir)) + symlink(module_test_dir, os.path.join(test_dir, options.module_name)) + # register module for testing in CTestTestfile.cmake + with open(os.path.join(test_dir, "CTestTestfile.cmake"), "ab") as f: + aStr = "SUBDIRS(%s)\n"%options.module_name + f.write(aStr.encode()) + else: + if verbose: + print(module_test_dir, " doesn't exist") pass #directory idl/salome : create it and link content @@ -189,7 +213,7 @@ def link_module(options): symlink(os.path.join(module_idl_dir, fn), os.path.join(idl_dir, fn)) else: if verbose: - print module_idl_dir, " doesn't exist" + print(module_idl_dir, " doesn't exist") #directory lib/salome : create it and link content if os.path.exists(module_lib_dir): @@ -200,12 +224,24 @@ def link_module(options): pass else: if verbose: - print module_lib_dir, " doesn't exist" + print(module_lib_dir, " doesn't exist") + pass + + #directory lib/paraview : create it and link content + if os.path.exists(module_pvlib_dir): + mkdir(pvlib_dir) + for fn in os.listdir(module_pvlib_dir): + symlink(os.path.join(module_pvlib_dir, fn), os.path.join(pvlib_dir, fn)) + pass + pass + else: + if verbose: + print(module_pvlib_dir, " doesn't exist") pass #directory lib/pyversio/site-packages/salome : create it and link content if not os.path.exists(module_lib_py_dir): - print "Python directory %s does not exist" % module_lib_py_dir + print("Python directory %s does not exist" % module_lib_py_dir) else: # Specific action for the package salome module_lib_pypkg_dir=os.path.join(module_lib_py_dir,"salome") @@ -228,7 +264,7 @@ def link_module(options): pass else: if verbose: - print module_lib_py_shared_dir, " doesn't exist" + print(module_lib_py_shared_dir, " doesn't exist") pass #directory share/doc/salome (KERNEL doc) : create it and link content @@ -238,6 +274,7 @@ def link_module(options): if fn == 'gui':continue if fn == 'tui':continue if fn == 'examples':continue + if fn == 'dev':continue symlink(os.path.join(module_sharedoc_dir, fn), os.path.join(sharedoc_dir, fn)) pass pass @@ -257,7 +294,7 @@ def link_module(options): symlink(os.path.join(module_sharedoc_tui_dir, fn), os.path.join(sharedoc_tui_dir, fn)) pass pass - + #directory share/doc/salome/examples : create it and link content if os.path.exists(module_sharedoc_examples): mkdir(sharedoc_examples_dir) @@ -266,6 +303,14 @@ def link_module(options): pass pass + #directory share/doc/salome/dev : create it and link content + if os.path.exists(module_sharedoc_dev): + mkdir(sharedoc_dev_dir) + for fn in os.listdir(module_sharedoc_dev): + symlink(os.path.join(module_sharedoc_dev, fn), os.path.join(sharedoc_dev_dir, fn)) + pass + pass + #directory share/salome : create it and link content if os.path.exists(module_share_dir): mkdir(share_dir) @@ -279,7 +324,7 @@ def link_module(options): #other directories (not resources) symlink(os.path.join(module_share_dir, fn), os.path.join(share_dir, fn)) else: - print "share/salome directory %s does not exist" % module_share_dir + print("share/salome directory %s does not exist" % module_share_dir) pass #html files in doc/salome directory @@ -308,6 +353,41 @@ def link_module(options): pass pass +def link_extra_test(options): + global verbose + + if not options.extra_test_path: + print("Option extra_test is mandatory") + return + + extra_test_dir=os.path.abspath(options.extra_test_path) + if not os.path.exists(extra_test_dir): + print("Test %s does not exist" % extra_test_dir) + return + + verbose = options.verbose + + home_dir = os.path.expanduser(options.prefix) + test_dir = os.path.join(home_dir,'bin','salome', 'test') + + if options.clear: + rmtree(test_dir) + pass + + #directory bin/salome/test : create it and link content + if os.path.exists(extra_test_dir): + # link /bin/salome/test/ to /bin/salome/test + print("link %s --> %s"%(os.path.join(test_dir, options.extra_test_name), extra_test_dir)) + symlink(extra_test_dir, os.path.join(test_dir, options.extra_test_name)) + # register extra_test for testing in CTestTestfile.cmake + with open(os.path.join(test_dir, "CTestTestfile.cmake"), "ab") as f: + aStr = "SUBDIRS(%s)\n" % options.extra_test_name + f.write(aStr.encode()) + else: + if verbose: + print(extra_test_dir, " doesn't exist") + pass + # ----------------------------------------------------------------------------- def main():