NRI : Update according to naming rule.

diff --git a/src/ARCHIMEDE/Makefile.in b/src/ARCHIMEDE/Makefile.in
index 465d4cb14aaa0f336cf22d9ba89511f1ce272293..d23c6791c5675f619d0cda2b529c4d32f4a98c67 100644 (file)
--- a/src/ARCHIMEDE/Makefile.in
+++ b/src/ARCHIMEDE/Makefile.in
@@ -16,7 +16,7 @@ VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl
 
 # Libraries targets
 
-LIB = libGeometryArchimede.la 
+LIB = libGEOMArchimede.la 
 LIB_SRC = Archimede_VolumeSection.cxx
 LIB_CLIENT_IDL = 
 

diff --git a/src/GEOM/Makefile.in b/src/GEOM/Makefile.in
index 8a4c26cd6c982c675e6d0780454c918b5fc13e3d..1a01df836cf73b22d72726e14bdf39e0031c8c49 100644 (file)
--- a/src/GEOM/Makefile.in
+++ b/src/GEOM/Makefile.in
@@ -30,7 +30,7 @@ EXPORT_HEADERS =
 # additionnal information to compil and link file
 CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
-LDFLAGS  += $(OCC_LIBS) -lGeometryDS -lSalomeDS -lSalomeNS -lSalomeContainer -lGeometryPartition -lGeometryArchimede -L${KERNEL_ROOT_DIR}/lib/salome
+LDFLAGS  += $(OCC_LIBS) -lGEOMDS -lSalomeDS -lSalomeNS -lSalomeContainer -lGEOMPartition -lGEOMArchimede -L${KERNEL_ROOT_DIR}/lib/salome
 
 # additional file to be cleaned
 MOSTLYCLEAN =

diff --git a/src/GEOMClient/Makefile.in b/src/GEOMClient/Makefile.in
index 47cd8163918beedd1afdd51212424801f0006742..cc65ff70e8e02c7c22a038e038cfb0e0012b6353 100644 (file)
--- a/src/GEOMClient/Makefile.in
+++ b/src/GEOMClient/Makefile.in
@@ -20,7 +20,7 @@ EXPORT_HEADERS = \
 
 # Libraries targets
 
-LIB = libGeometryClient.la
+LIB = libGEOMClient.la
 LIB_SRC = GEOM_Client.cxx
 LIB_SERVER_IDL = SALOME_Component.idl SALOMEDS.idl SALOME_Exception.idl GEOM_Shape.idl GEOM_Gen.idl
 

diff --git a/src/GEOMDS/Makefile.in b/src/GEOMDS/Makefile.in
index 0951065383aecb794a2256fcada15eec346c88d7..30e8fdc5c3ef5d4c5aec99aaf7b45017f73cdee6 100644 (file)
--- a/src/GEOMDS/Makefile.in
+++ b/src/GEOMDS/Makefile.in
@@ -16,7 +16,7 @@ VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl
 
 # Libraries targets
 
-LIB = libGeometryDS.la 
+LIB = libGEOMDS.la 
 LIB_SRC = GEOMDS_Application.cxx \
          GEOMDS_Commands.cxx \
          GEOMDS_Explorer.cxx \
@@ -43,7 +43,7 @@ EXPORT_HEADERS= GEOMDS_Application.hxx \
 # additionnal information to compil and link file
 CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
-LDFLAGS  += $(OCC_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome
+LDFLAGS  += $(OCC_LIBS)
 
 # additional file to be cleaned
 MOSTLYCLEAN =

diff --git a/src/GEOMFiltersSelection/Makefile.in b/src/GEOMFiltersSelection/Makefile.in
index 1e0a90fdc2069082bf7fef15b328e14bfafbb706..954d25e43a01daf14b8a6d96a1f61683f5d17194 100644 (file)
--- a/src/GEOMFiltersSelection/Makefile.in
+++ b/src/GEOMFiltersSelection/Makefile.in
@@ -16,7 +16,7 @@ VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl
 
 # Libraries targets
 
-LIB = libGeometryFiltersSelection.la 
+LIB = libGEOMFiltersSelection.la 
 LIB_SRC = GEOM_ShapeTypeFilter.cxx \
          GEOM_FaceFilter.cxx \
          GEOM_EdgeFilter.cxx

diff --git a/src/GEOMGUI/Makefile.in b/src/GEOMGUI/Makefile.in
index 59655d0b8011705b0931b962ab8ad25c34c4afbe..dbbef4314ef1bf649dc89221e8e4d80faf57ca24 100644 (file)
--- a/src/GEOMGUI/Makefile.in
+++ b/src/GEOMGUI/Makefile.in
@@ -149,6 +149,6 @@ LIB_SERVER_IDL =
 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
 
-LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGeometryClient -lGeometryObject -lGeometryFiltersSelection -lGeometrySketcher $(OCC_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome
+LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGEOMClient -lGEOMObject -lGEOMFiltersSelection -lGEOMSketcher $(OCC_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome
 
 @CONCLUDE@

diff --git a/src/GEOM_SWIG/GEOM_example2.py b/src/GEOM_SWIG/GEOM_example2.py
index 61c1e2bb9ea2759d3f37135abf859eee16e40256..cb016efadce6ebfa11c0153ea622ee070148313b 100644 (file)
--- a/src/GEOM_SWIG/GEOM_example2.py
+++ b/src/GEOM_SWIG/GEOM_example2.py
@@ -11,7 +11,7 @@ import salome
 import geompy
 import math
 
-geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry")
+geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 myBuilder = salome.myStudy.NewBuilder()
 
 point0  = geom.MakePointStruct(0.,0.,0.)

diff --git a/src/GEOM_SWIG/GEOM_example3.py b/src/GEOM_SWIG/GEOM_example3.py
index a66a4fa5776cc7973351b7da890513c37d1bf9d0..70130a7aa855af20c4a811b1a0174a41b1c09c6c 100644 (file)
--- a/src/GEOM_SWIG/GEOM_example3.py
+++ b/src/GEOM_SWIG/GEOM_example3.py
@@ -12,7 +12,7 @@ import geompy
 import math
 from time import sleep
 
-geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry")
+geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 myBuilder = salome.myStudy.NewBuilder()
 
 gg = salome.ImportComponentGUI("Geometry")

diff --git a/src/GEOM_SWIG/GEOM_example4.py b/src/GEOM_SWIG/GEOM_example4.py
index a78cd9d012978a29f7f60b7bdab00625cd11aa15..3ec10fa07924020e0d3f4ad3109f9ae23c870315 100755 (executable)
--- a/src/GEOM_SWIG/GEOM_example4.py
+++ b/src/GEOM_SWIG/GEOM_example4.py
@@ -7,7 +7,7 @@ import math
 
 import geompy
 
-geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry")
+geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 myBuilder = salome.myStudy.NewBuilder()
 from geompy import gg
 

diff --git a/src/GEOM_SWIG/GEOM_moteur.py b/src/GEOM_SWIG/GEOM_moteur.py
index 2f6b4341b56cd92262f0254f337c6680fe1d80f9..3c879fd83a93e174d6fa63d7634204d6bc9cce58 100644 (file)
--- a/src/GEOM_SWIG/GEOM_moteur.py
+++ b/src/GEOM_SWIG/GEOM_moteur.py
@@ -11,7 +11,7 @@ import salome
 import geompy
 import math
 
-geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry")
+geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 myBuilder = salome.myStudy.NewBuilder()
 
 #Variables modifiables

diff --git a/src/GEOM_SWIG/GEOM_usinggeom.py b/src/GEOM_SWIG/GEOM_usinggeom.py
index aa315c2db78179e196d474d300928d0e7b0faeb7..97674648ee52109c99e0c29c9d040e5d51e29a23 100644 (file)
--- a/src/GEOM_SWIG/GEOM_usinggeom.py
+++ b/src/GEOM_SWIG/GEOM_usinggeom.py
@@ -11,7 +11,7 @@ import salome
 import geompy
 import math
 
-geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry")
+geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 myBuilder = salome.myStudy.NewBuilder()
 
 from geompy import gg

diff --git a/src/GEOM_SWIG/Makefile.in b/src/GEOM_SWIG/Makefile.in
index 1063065721ff489f75ac83bd059aa8f0b7c686be..0790ec2bd1828b6c802fc7c115a11ef64db80451 100644 (file)
--- a/src/GEOM_SWIG/Makefile.in
+++ b/src/GEOM_SWIG/Makefile.in
@@ -17,7 +17,7 @@ VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl
 
 # Libraries targets
 
-LIB = libGeometry_Swigcmodule.la
+LIB = libGEOM_Swigcmodule.la
 LIB_SRC = 
 
 SWIG_DEF = libGeometry_Swig.i

diff --git a/src/GEOM_SWIG/batchmode_geompy.py b/src/GEOM_SWIG/batchmode_geompy.py
index ce01529b8715e85f5ec008d617c389dc1ddb4fba..6601dc6e3aa67b40628e3697d0e091801dbc55f2 100644 (file)
--- a/src/GEOM_SWIG/batchmode_geompy.py
+++ b/src/GEOM_SWIG/batchmode_geompy.py
@@ -13,7 +13,7 @@ from batchmode_salome import *
 
 #--------------------------------------------------------------------------
 
-geom = lcc.FindOrLoadComponent("FactoryServer", "Geometry")
+geom = lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 geom.GetCurrentStudy(myStudyId)
 myBuilder = myStudy.NewBuilder()
 

diff --git a/src/GEOM_SWIG/geompy.py b/src/GEOM_SWIG/geompy.py
index 6d20eb004d3716b72fce5dd90a5b1caefdd85a11..2805bcf3863d26c6306638f5b68f45cdefb550cd 100644 (file)
--- a/src/GEOM_SWIG/geompy.py
+++ b/src/GEOM_SWIG/geompy.py
@@ -24,7 +24,7 @@ if father is None:
         father = myBuilder.NewComponent("GEOM")
         A1 = myBuilder.FindOrCreateAttribute(father, "AttributeName");
         FName = A1._narrow(SALOMEDS.AttributeName)
-        FName.SetValue("Geometry")
+        FName.SetValue( salome.sg.getComponentUserName("GEOM") )
        A2 = myBuilder.FindOrCreateAttribute(father, "AttributePixMap");
        aPixmap = A2._narrow(SALOMEDS.AttributePixMap);
        aPixmap.SetPixMap( "ICON_OBJBROWSER_Geometry" );

diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in
index be5adc73545d843d34ec1383ec5521c01ecea834..2b6f422eb7edfc513bf01b395564afe97f57ce35 100644 (file)
--- a/src/OBJECT/Makefile.in
+++ b/src/OBJECT/Makefile.in
@@ -17,7 +17,7 @@ EXPORT_HEADERS = GEOM_Actor.h \
 
 # Libraries targets
 
-LIB = libGeometryObject.la
+LIB = libGEOMObject.la
 LIB_SRC =       GEOM_Actor.cxx \
                 GEOM_OCCReader.cxx \
                 GEOM_AssemblyBuilder.cxx \

diff --git a/src/PARTITION/Makefile.in b/src/PARTITION/Makefile.in
index 909a07325af99a61edcd71aadf2e90fa4513270b..c5038bf8b44036a7e6690f6a2ad774804033ec14 100644 (file)
--- a/src/PARTITION/Makefile.in
+++ b/src/PARTITION/Makefile.in
@@ -15,7 +15,7 @@ VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl
 @COMMENCE@
 
 # Libraries targets
-LIB = libGeometryPartition.la
+LIB = libGEOMPartition.la
 LIB_SRC = Partition_Inter2d.cxx \
          Partition_Inter3d.cxx \
          Partition_Loop2d.cxx \

diff --git a/src/SKETCHER/Makefile.in b/src/SKETCHER/Makefile.in
index ba4dccfd744ba43a9c88bf787f9088f8cf67df50..1c5d1225eeebd80ea2d56394a8cc2a33324cac22 100644 (file)
--- a/src/SKETCHER/Makefile.in
+++ b/src/SKETCHER/Makefile.in
@@ -15,7 +15,7 @@ VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl
 
 # Libraries targets
 
-LIB = libGeometrySketcher.la 
+LIB = libGEOMSketcher.la 
 LIB_SRC = GEOM_Sketcher.cxx
 LIB_CLIENT_IDL = SALOME_Component.idl SALOMEDS.idl SALOME_Exception.idl GEOM_Shape.idl GEOM_Gen.idl